Commit Graph

13059 Commits

Author SHA1 Message Date
Thomas Müller f28f6a3001 Merge pull request #23302 from owncloud/fed-unshare-with-9
[9.0] Specify the target user when unsharing a federated share
2016-03-17 10:07:19 +01:00
Robin McCorkell 403eb87f4d Display external storage GUI even if user mounting disabled 2016-03-16 22:10:36 +00:00
Morris Jobke 3a773f4eca Give swift 15 seconds after startup 2016-03-16 18:08:42 +01:00
Thomas Müller adbc5bbd1f Merge pull request #23271 from owncloud/backport-23192
[stable9] Backport 23192
2016-03-16 16:50:04 +01:00
Robin Appelman 95cd1671b3 handle connection errors as storage not available in smb 2016-03-16 14:47:03 +01:00
Robin Appelman 8c035ae6f6 Specify the target user when unsharing a federated share 2016-03-16 13:29:04 +01:00
Thomas Müller d54106dada Merge pull request #23264 from owncloud/fix_22907_9.0
allow group shares, even if not all public keys are available
2016-03-16 11:18:51 +01:00
Lukas Reschke cdadd4cd1b Fallback for crappy ancient distributions
Fixes https://github.com/owncloud/core/issues/23181
2016-03-15 17:14:53 +01:00
Bjoern Schiessle 0f372a2a8c allow group shares, even if not all public keys are available 2016-03-15 15:13:55 +01:00
Lukas Reschke 987146d5db Delay check till scanner is used
Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
2016-03-15 14:39:16 +01:00
Robin Appelman 9d688e655d move failedstorage to core 2016-03-15 12:49:12 +01:00
Robin Appelman f29440dbbc dont break when there is an invalid share 2016-03-15 12:49:06 +01:00
Thomas Müller 99de93a6c6 Merge pull request #23075 from owncloud/backport-23074-oracle-ext-storage
[9.0] Correctly escape join statements and use selectAlias
2016-03-15 12:13:54 +01:00
Thomas Müller cf232c4182 Merge pull request #23112 from owncloud/backport-23086-stable9
[9.0] remove deprecated ldap_sort
2016-03-14 17:16:36 +01:00
Thomas Müller efa673136e Merge pull request #23223 from owncloud/backport-23091-case-insensitive-group-sharing
[9.0] Case insensitive group sharing
2016-03-14 16:33:51 +01:00
Thomas Müller 3380a3af74 Merge pull request #22949 from owncloud/stable9-fix-group-share-migration-for-calendars-and-contacts
Fix group sharing and sharing permissions - fixes #22932
2016-03-14 16:31:08 +01:00
Thomas Müller 2609bf3500 Merge pull request #23114 from owncloud/no-fatal-error-if-DSTART-is-not-set-stable9
No fatal error if dstart is not set stable9
2016-03-14 16:14:03 +01:00
Thomas Müller 884a3b9bb4 Merge pull request #23105 from owncloud/readonly-birthday-cal-stable9
The birthday_calendar is read-only
2016-03-14 16:07:42 +01:00
Joas Schilling a9ed80869a Correctly lower the search input as well 2016-03-14 13:48:45 +01:00
Joas Schilling 5b593450c3 Return the correct group casing in sharee api 2016-03-14 13:48:13 +01:00
Thomas Müller dac69225d2 Merge pull request #23102 from owncloud/stable9-backport-23094
[stable9] Fake LOCK statement for Windows 7, 8 and 10 network mounts
2016-03-13 19:51:26 +01:00
Thomas Müller b752a08d63 Merge pull request #23127 from owncloud/fix-getOwner-on-fileshome-stable9
getOwner is not available on FileHome - fixes #23116
2016-03-11 15:05:20 +01:00
Thomas Müller e3de44ea51 Merge pull request #23060 from owncloud/stable9_backport_23056
[stable 9] Add mimetype to OCS Share API output
2016-03-11 14:51:21 +01:00
Thomas Müller aeb480a8c3 Merge pull request #23113 from owncloud/allow-migrating-all-calendars-stable9
Allow to migrate calendars of all users
2016-03-10 23:10:41 +01:00
Georg Ehrke b0c7eba7d0 add title and color to birthday calendar 2016-03-10 22:55:32 +01:00
Thomas Müller e89f27e191 getOwner is not available on FileHome - fixes #23116 2016-03-10 22:51:02 +01:00
Thomas Müller 62a36ee884 The birthday_calendar is read-only 2016-03-10 21:36:11 +01:00
Thomas Müller a58e374956 Merge pull request #22909 from owncloud/backport-22244-prevent-calendar-proppatch
[9.0] Prevent calendar proppatch for share recipients
2016-03-10 21:32:38 +01:00
Thomas Müller 36b543c490 fixes #23004 2016-03-10 17:59:02 +01:00
Thomas Müller 8465f9b6c6 fixes #23020 2016-03-10 17:58:53 +01:00
Joas Schilling 7126b64088 Allow to migrate calendars of all users 2016-03-10 17:47:08 +01:00
Arthur Schiwon 38d137c34c remove deprecated ldap_sort 2016-03-10 17:08:25 +01:00
Morris Jobke 098ce188b7 Fake LOCK statement for Windows 7, 8 and 10 network mounts
* fixes #22596
2016-03-10 15:57:33 +01:00
Joas Schilling 09febaad49 Correctly escape join statements and use selectAlias 2016-03-10 10:28:39 +01:00
Thomas Müller 4e90bc017e Merge pull request #22825 from owncloud/backport-22778-stable9
[backport] [stable9] untangle different user manager instances, fixes #22770
2016-03-10 08:26:11 +01:00
Thomas Müller b017434302 Merge pull request #23024 from owncloud/stable9-backport-22986
[stable9] Remove disabled autocorrect for new file names
2016-03-09 21:44:47 +01:00
Roeland Jago Douma 48cdf38d00 Add mimetype to OCS Share API output
Fixes #23044
2016-03-09 21:28:38 +01:00
Thomas Müller bd144efeb1 Merge pull request #22990 from owncloud/stable9-backport-has-key
[stable9] Use "hasKey" instead of checking the value
2016-03-09 15:04:59 +01:00
Morris Jobke 88b9db44a0 Remove disabled autocorrect for new file names
* ref #22784
2016-03-09 14:59:57 +01:00
Thomas Müller d4d4b8d51a Merge pull request #22841 from owncloud/stable9_22830
[Stable 9] Rename and move permissions are set when a file is updatable
2016-03-09 12:27:03 +01:00
Thomas Müller b955ce6141 Merge pull request #22886 from owncloud/stable9-show-version-to-update-to
[stable9] Show version to update to properly
2016-03-09 12:26:53 +01:00
Thomas Müller c2a16e0584 Merge pull request #22922 from owncloud/stable9-share-archivenamedownloadall
[stable9] Fix archive file name when downloading public share
2016-03-09 12:26:18 +01:00
Thomas Müller d652c87f86 Merge pull request #22924 from owncloud/stable9-versions-fixmtimetooltip
[stable9] Fix tooltip for versions mtime
2016-03-09 12:26:04 +01:00
Thomas Müller 72d4e672b2 Merge pull request #22925 from owncloud/stable9-trash-returnfalseon401
[stable9] Return false on 401 in file list + trash file list
2016-03-09 12:25:47 +01:00
Thomas Müller 95201a829f Merge pull request #22926 from owncloud/stable9-files-newmenu-removebrowsercomplete
[stable9] Remove browser autocomplete in new file menu
2016-03-09 12:25:30 +01:00
Lukas Reschke ddf56b84d4 Use "hasKey" instead of checking the value
If the check is negative it would depending on the used cache store the value as an empty string. When reading the value this check would thus return "false" even if a value exists.
2016-03-09 09:19:11 +01:00
Lukas Reschke 1975ffa9e7 Fix compatibility with PHP 5.4
Fixes https://github.com/owncloud/core/issues/22960
2016-03-08 19:58:49 +01:00
Thomas Müller 8d6a6667e5 Fix group sharing and sharing permissions - fixes #22932 2016-03-08 14:45:36 +01:00
Vincent Petry d63f5561fb Fix share mounting recursion 2016-03-08 12:58:46 +01:00
Vincent Petry 795331212a Remove browser autocomplete in new file menu 2016-03-07 22:04:36 +01:00
Vincent Petry c9476115b0 Return false on 401 in file list + trash file list
This gives a chance to the global ajax error handler to do its work if
the session expired.
2016-03-07 22:02:19 +01:00
Vincent Petry cfd9c7f6b9 Fix tooltip for versions mtime
It was missing a call to jquery.tooltip
2016-03-07 21:58:17 +01:00
Vincent Petry ebfc8b67d7 Remove "files" arg from download URL in public link page
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
2016-03-07 21:48:15 +01:00
Vincent Petry f9e1d4d56e Fix archive file name when downloading public share
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.

This fix makes sure to trigger the correct logic when no file list was
given.
2016-03-07 21:48:10 +01:00
Thomas Müller b5a06ecd5c Calendar and addressbook migration commands are always available 2016-03-07 15:24:23 +01:00
Thomas Müller 79811b5806 Handle addressbook migration issue by writing the faulty event to the log and continue 2016-03-07 15:24:13 +01:00
Thomas Müller 6413fffdcb Handle calendar migration issue by writing the faulty event to the log and continue 2016-03-07 15:24:03 +01:00
Thomas Müller b3b57621b7 Merge pull request #22897 from owncloud/backport-22896
[9.0] Correctly default to null and add type hint
2016-03-07 14:59:49 +01:00
Joas Schilling 5af8ebe3bd Allow to change properties of readonly calendars 2016-03-07 13:58:44 +01:00
Joas Schilling 27f3dcc682 Allow to hide a shared calendar 2016-03-07 13:58:32 +01:00
Thomas Müller b1a1a46193 For 9.0 we don't have the possibility to store calendar and addressbook properties on a per-user basis and therefore we simple don't allow this for now 2016-03-07 13:58:24 +01:00
Vincent Petry c1876ea51c Fix uploading when free space is unlimited
A federated share can report unlimited quota as -3, so the
ajax/upload.php code needs to be adjusted to block uploads when the free
space is unlimited.
2016-03-07 12:41:36 +01:00
Joas Schilling 9ec89b99b1 Correctly default to null and add type hint 2016-03-07 10:55:01 +01:00
Thomas Müller 6f4712a314 Merge pull request #22884 from owncloud/backport-cache-results
[stable9] Cache results of testRemoteUrl
2016-03-06 19:57:53 +01:00
Lukas Reschke ef66729980 Use custom header
PHP in CGI mode eats the Authorization header => 💣
2016-03-05 23:07:11 +01:00
Lukas Reschke 17f5f19187 Show version to update to properly
Properly shows the version that will be updated to.
2016-03-05 22:02:55 +01:00
Lukas Reschke 71e3f7f866 Cache results of testRemoteUrl
Otherwise setting up the storage will result in a HTTP request and thus slowing down ownCloud.

Replaces https://github.com/owncloud/core/pull/22855
2016-03-05 21:09:58 +01:00
C. Montero Luque 5488bb74fe Merge pull request #22879 from owncloud/stable9-backport-use-clob-for-timezone
[stable9] Use CLOB for timezone
2016-03-04 18:02:45 -05:00
C. Montero Luque 4b85660984 Merge pull request #22871 from owncloud/enable-federation-app-stable9
[stable9] Automatically enabled federation app
2016-03-04 18:02:32 -05:00
C. Montero Luque 5080c34d78 Merge pull request #22867 from owncloud/stable9-backport-22865
[stable9] Run cleanup of expired DB file locks to background job
2016-03-04 17:45:07 -05:00
C. Montero Luque 5d402fc817 Merge pull request #22848 from owncloud/stable9-fileactions-downloadspinnerfix
[stable9] Fix download spinner to work with CSS styles
2016-03-04 16:41:26 -05:00
Lukas Reschke fb62043cc1 [stable9] Use CLOB for timezone
TEXT defaults to a length of 255 which is going to fail in some cases as the timezone can be rather long.

This changes it back to a CLOB as it has been before as well: owncloudarchive/calendar@8d8bb68. I'm not super convinced that CLOB is the best choice here but at least it seems to work.

Fixes #22876

Backport of https://github.com/owncloud/core/pull/22878 to stable9
2016-03-04 22:12:54 +01:00
Morris Jobke 9737290e39 Run cleanup of expired DB file locks to background job
* fixes #22819

The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.

This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
2016-03-04 20:13:05 +01:00
C. Montero Luque 121ff350d4 Merge branch 'stable9' into enable-federation-app-stable9 2016-03-04 13:38:02 -05:00
Lukas Reschke eb59aa8be4 Automatically enabled federation app 2016-03-04 17:40:45 +01:00
Vincent Petry 96d45e90dc Properly check path validity before deleting to trash
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
2016-03-04 15:33:02 +01:00
Thomas Müller 0655f25406 Merge pull request #22858 from owncloud/stable9-release-channel
[stable9] Add release channel selection back
2016-03-04 15:29:37 +01:00
Lukas Reschke 7ff2b9232b Add release channel selection back
Allows to select the release channels again and also shows the last check date
2016-03-04 14:39:14 +01:00
Vincent Petry e6c6ee8d2a Fix download spinner to work with CSS styles
A recent change replaced img elements with CSS icons for file actions.
This fix adjusts the logic to work properly with CSS icons instead of
images.
2016-03-04 10:50:41 +01:00
Roeland Jago Douma 3673cfae3c Rename and move permissions are set when a file is updatable
* Fix unit tests
2016-03-04 09:37:52 +01:00
Vincent Petry 8e8f5cdddf Properly set exception in FailedStorage 2016-03-03 20:07:22 +01:00
Robin Appelman f603c57751 allow availability recheck for external storages 2016-03-03 20:07:18 +01:00
Arthur Schiwon dd556d77da untangle different user manager instances, fixes #22770 2016-03-03 17:26:52 +01:00
Lukas Reschke 98f79173ed Keep "encryptedVersion" when calling `\OC\Files\View::copy`
When calling `\OC\Files\View::copy` we should also keep the version to ensure that the file will always have the correct version attached and can be successfully decrypted.

To test this the following steps are necessary (from https://github.com/owncloud/core/issues/22781#issuecomment-191328982):

1. setup a new ownCloud 9.0 beta2
2. enable encryption
2. upload a docx (5.7MB large)
3. upload the same file again and overwrite the existing file
4. I can download the original file and the first version
5. I restore the first version
6. restored version can no longer be downloaded with the error described above

The manual cache operation in `\OCA\Files_Versions\Storage` is unfortunately necessary since `\OCA\Files_Versions\Storage::copyFileContents` is not using `\OCP\Files\Storage::moveFromStorage` in the case when an object storage is used. Due to the workaround added in 54cea05271 the stream is directly copied and thus bypassing the FS.
2016-03-03 14:41:53 +01:00
C. Montero Luque 4d69e562a0 Merge pull request #22757 from owncloud/apply-license
Update copyright information and author file
2016-03-01 15:36:37 -05:00
C. Montero Luque 5a2fe4107c Merge branch 'master' into part-file-root 2016-03-01 13:35:04 -05:00
C. Montero Luque 745fdc4800 Merge pull request #22742 from owncloud/ceph-keystone-readiness
Use readiness notification socket to be absolutely sure this works
2016-03-01 13:34:23 -05:00
Lukas Reschke 3067367ff3 Add new apps 2016-03-01 17:52:32 +01:00
Lukas Reschke c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke c430f5ba53 Map Maci 2016-03-01 17:45:05 +01:00
Lukas Reschke 933f60e314 Update author information
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
Robin Appelman 37f1206818 allow putting the part file in the view root 2016-03-01 15:21:24 +01:00
Thomas Müller 900dcf6594 Merge pull request #22699 from owncloud/checksum_int_test
Checksum intergration tests and fixes
2016-03-01 14:47:09 +01:00
Thomas Müller a83af96dd3 Merge pull request #22686 from owncloud/cleanup_remote_address_books
remove remote address book if access was revoked
2016-03-01 14:46:51 +01:00
Vincent Petry 57babe032b Save some calls to refreshInfo during upload 2016-03-01 11:44:49 +01:00
Roeland Jago Douma ac392457f2 Fix unit tests 2016-03-01 11:37:16 +01:00
Roeland Jago Douma ec140fa2ec Checksums on chunked files
We should also store checksums on chunked files.
We do not checksum individual chunks but only the final file.
2016-03-01 11:37:16 +01:00
Roeland Jago Douma 3e88a5067f Remove checksum on upload of non checksumed file
When we overwrite a checksumed file with a file without a checksum we
should remove the checksum from the server.

This is done by setting the column to empty.
2016-03-01 11:37:16 +01:00
Thomas Müller 5fe5233f41 Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs
Add autodiscovery support to server-to-server sharing implementation
2016-03-01 11:27:28 +01:00
Thomas Müller 73e145cf63 Merge pull request #22728 from owncloud/external-share-testremote
use ocs discover endpoint to test remote
2016-03-01 11:27:07 +01:00
Bjoern Schiessle 1832bd0fa1 increase version number 2016-03-01 11:21:24 +01:00
Thomas Müller a66899c528 Handle null case 2016-03-01 10:41:05 +01:00
Thomas Müller 1652541150 Merge pull request #22700 from owncloud/only_1_linkshare
For now only allow 1 link share per file/folder
2016-03-01 09:22:39 +01:00
Thomas Müller 25a4571dcd Merge pull request #22731 from owncloud/hide-nodes-from-listening
Hides nodes from listing that the user has no access to
2016-03-01 09:22:08 +01:00
Thomas Müller fd4742d430 Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset
Don't return quota when none set
2016-03-01 08:30:58 +01:00
Roeland Jago Douma ffce4fc6a9 For now only allow 1 link share per file/folder
Fixes #22692
This is a temp fix util we get #22327

We just block it in the OCS Share API since we have 1 endpoint now
anyway.
2016-03-01 08:25:40 +01:00
Thomas Müller eb740d1dac Merge pull request #22727 from owncloud/decrypt_all_master_key
make decrypt all work with the master key
2016-03-01 08:23:27 +01:00
Thomas Müller f3050b3adb Merge pull request #22740 from owncloud/fix_resare_updates
Check correct permissions when resharing
2016-03-01 08:17:56 +01:00
Jenkins for ownCloud a06f59c580 [tx-robot] updated from transifex 2016-03-01 01:55:33 -05:00
Thomas Müller 3adb6ae0f5 Merge pull request #22707 from owncloud/use-our-public-api
Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
2016-03-01 07:24:57 +01:00
Lukas Reschke 9ca1e9c7e9 Only use scanner if remote is an ownCloud 2016-03-01 07:01:52 +01:00
Lukas Reschke e965dcaebf /shareinfo is not required 2016-03-01 07:01:52 +01:00
Lukas Reschke 8f95d69954 Fix tests 2016-03-01 07:01:52 +01:00
Lukas Reschke 74e47da883 Add missing trailing slash 2016-03-01 07:01:51 +01:00
Robin Appelman 080a62231e use ocs discover endpoint to test remote 2016-03-01 07:01:51 +01:00
Lukas Reschke 88fc5149ed Fix Scrutinizer issues 2016-02-29 22:44:40 +01:00
Robin McCorkell 078cc3b3f0 Use readiness notification socket to be absolutely sure this works 2016-02-29 21:20:11 +00:00
Lukas Reschke d04edfaf0d Hides nodes from listing that the user has no access to 2016-02-29 20:53:38 +01:00
Roeland Jago Douma 8924b0a0dc Check correct permissions when resharing
Fixes #22675

Since we only get a share id we do not know the path for the sharer.
Now if we edit a share we start searching for shares for that user of
that node. And deduce the permissions that way.

* Intergration test added
* Fix unit tests
2016-02-29 19:30:14 +01:00
Bjoern Schiessle 9e9cb73987 fix doc-block 2016-02-29 16:50:34 +01:00
Bjoern Schiessle 87e47afed8 remove synced remote address book if the remote server revoked access to his system address book 2016-02-29 16:50:34 +01:00
Bjoern Schiessle 7189c72c33 remove remote address book if the admin removes the server from the trusted servers list 2016-02-29 16:50:33 +01:00
Thomas Müller 52d217d775 Merge pull request #22623 from owncloud/docker-logs-on-swift-external
Print docker logs to the console fro debugging
2016-02-29 16:36:34 +01:00
Bjoern Schiessle 95ea2ccb53 make decrypt all work with the master key 2016-02-29 14:54:32 +01:00
Vincent Petry 11215f4e27 Return -3 for unlimited quota
Returns -3 for unlimited quota in Webdav response.
Also adjusted personal page to show unlimited quota when set.
2016-02-29 14:36:20 +01:00
Thomas Müller a38e8b6436 Merge pull request #22662 from owncloud/comments-count
remove comments count because it is not that relevant to show directly
2016-02-29 13:44:56 +01:00
Joas Schilling 2a0cda74d4 Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* 2016-02-29 09:44:40 +01:00
Jenkins for ownCloud 5800585039 [tx-robot] updated from transifex 2016-02-29 01:55:04 -05:00
Jenkins for ownCloud a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Jenkins for ownCloud f9826ec948 [tx-robot] updated from transifex 2016-02-27 01:56:08 -05:00
Bjoern Schiessle eccd7cf654 reuse the url_hash instead of calculating a new hash for the address book 2016-02-26 20:00:13 +01:00
Thomas Müller e9237dd83c Merge pull request #22671 from owncloud/issue-22670
Move the tag filter at the end for now
2016-02-26 10:48:55 +01:00
Thomas Müller 66536f912e Merge pull request #22640 from owncloud/fix_22587
Remove delete permissions for read-only federated reshares
2016-02-26 10:48:07 +01:00
Thomas Müller c6c15ba825 Merge pull request #22608 from owncloud/collaborative-tags
Rename system tags app to collaborative tags
2016-02-26 10:47:40 +01:00
Thomas Müller 96f15a12a9 Merge pull request #22461 from owncloud/fix_6773
Allow theming of actions
2016-02-26 10:47:20 +01:00
Joas Schilling 4549b82553 Move the tag filter at the end for now 2016-02-26 10:15:07 +01:00
Lukas Reschke 59028cced0 Add autodiscovery support to server-to-server sharing
Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
2016-02-26 09:26:55 +01:00
Joas Schilling 4471f359b1 Rename system tags app to collaborative tags 2016-02-26 09:14:28 +01:00
Jenkins for ownCloud 5718402277 [tx-robot] updated from transifex 2016-02-26 01:55:44 -05:00
Vincent Petry 867a8aca12 Fix favorite icon unit test for icon image 2016-02-25 23:01:09 +01:00
Vincent Petry b634f1e2c7 Make more action icons themable + style fixes
Action icons now appear properly in public link page.
More actions are now CSS icons.
2016-02-25 23:01:07 +01:00
Roeland Jago Douma c767030f07 Close class 2016-02-25 22:49:52 +01:00
Roeland Jago Douma 92cff0984d Make file actions use icon CSS classes
This makes theming of file actions possible
2016-02-25 22:49:52 +01:00
Jan-Christoph Borchardt 6e97ab1b71 remove comments count because it is not that relevant to show directly 2016-02-25 20:48:19 +01:00
Thomas Müller 3772a8acdb Merge pull request #22644 from owncloud/external-share-manager
inject the correct external share manager into the storage
2016-02-25 16:58:00 +01:00
Thomas Müller 29e3c4a60e Merge pull request #22628 from owncloud/fix-thrashbin-cronjob
Skip users with no trashbin
2016-02-25 16:55:36 +01:00
Robin Appelman f338329ddf inject the correct external share manager into the storage 2016-02-25 14:49:25 +01:00
Thomas Müller 914ac09aae Merge pull request #22636 from owncloud/fix-ssl-on-external-storages
Fix HTTPS support on external storages
2016-02-25 14:36:00 +01:00
Thomas Müller 202bf17e4a Merge pull request #22604 from owncloud/fix-google-drive-encryption
Copy into local file
2016-02-25 14:35:39 +01:00
Thomas Müller 5ecf2d5987 Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefault
Disable sharing by default for external storage mounts
2016-02-25 14:35:24 +01:00
Thomas Müller dfaebc36d2 Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname
take the first result of that array, if present. Fixes 2nd display na…
2016-02-25 14:35:06 +01:00
Roeland Jago Douma 0c9c7737b4 Remove delete permissions for read-only federated reshares
An incomming federated share is just a mount point. Therefor if we
request the permissions on the mountpoint DELETE permissions will be
returned (among others). Since we can always remove a mountpoint, update
a mount point.

However now when trying to reshare we will try to reshare with DELETE
permissions. Which is false.

This PR removes the delete permissions if it is a shared storage.

Basically a quick hack.
Fixes #22587
2016-02-25 12:19:38 +01:00
Lukas Reschke aebb900cd4 More error handling 2016-02-25 10:12:31 +01:00
Lukas Reschke 3b5ddb417c Copy into local file
Using the Guzzle stream directly here will only return 1739 characters for `fread` instead of all data. This leads to the problem that the stream is read incorrectly and thus the data cannot be properly decrypted => 💣

This approach copies the data into a local temporary file, as done before in all stable releases as well as other storage connectors.

While this approach will load the whole file into memory, this is already was has happened before in any stable release as well. See d608c37c90 for the breaking change.

To test this enable Google Drive as external storage and upload some files with encryption enabled. Reading the file should fail now.

Fixes https://github.com/owncloud/core/issues/22590
2016-02-25 09:40:30 +01:00
Jenkins for ownCloud 32f4bea0ae [tx-robot] updated from transifex 2016-02-25 01:58:06 -05:00
Arthur Schiwon b9b85e32be take the first result of that array, if present. Fixes 2nd display name to be 'Array', if cache is configured and enabled. 2016-02-24 21:32:03 +01:00
Lukas Reschke db2ddb5441 Properly cast type
The current logic is checking whether:

1. The returned value is a boolen
2. The returned value is a string and then matches for "true"

Since the config is now written to the database the data is now a string with the value "1" if HTTPS is set to true. Effectively this option was thus always disabled at the moment, falling back to plain HTTP.

This change casts the data to a boolean if it is defined as boolean.

Fixes https://github.com/owncloud/core/issues/22605
Fixes https://github.com/owncloud/core/issues/22016
2016-02-24 19:58:41 +01:00
Victor Dubiniuk aac6932e92 Skip users with no trashbin 2016-02-24 18:08:45 +03:00
Vincent Petry 4829a2d421 Disable sharing by default for external storage mounts
This is for newly created mount points.

Migrated mount points will have sharing enabled as before.
2016-02-24 13:58:21 +01:00
Thomas Müller ac9de4ee95 Print docker logs to the console fro debugging 2016-02-24 13:58:13 +01:00
Thomas Müller faf65e73b7 Merge pull request #22593 from owncloud/swift-docker-fix
Enable upstream entrypoint changes with Ceph Docker
2016-02-24 12:17:58 +01:00
Thomas Müller 473cd97a45 Merge pull request #22592 from owncloud/fix-response-header
Add header for attachment disposition only once
2016-02-24 12:15:32 +01:00
Thomas Müller 9a0950f10b Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries
Allow defining a limit and offset for getObjectIdsForTags
2016-02-23 15:02:08 +01:00
Morris Jobke 403f11633c Drop unneeded use statements 2016-02-23 14:53:12 +01:00
Robin McCorkell 1d8c1f5692 Enable upstream entrypoint changes with Ceph Docker 2016-02-23 11:52:05 +00:00
Lukas Reschke fc2c5fe414 Add header for attachment disposition only once
Recent refactorings have resulted in the header being added twice, this makes browsers ignore the header which removes any security gains.

This changeset adds the header only once and adds integration tests ensuring the correct header in future.

https://github.com/owncloud/core/issues/22577
2016-02-23 12:23:41 +01:00
Thomas Müller fae6643e6d Merge pull request #22582 from owncloud/case-insensitive-contact-search
Case insensitive contact search
2016-02-23 10:48:38 +01:00
Thomas Müller a3d1b2637d Merge pull request #22516 from owncloud/core-cumulativenotifications
Accumulate notifications instead of blinking
2016-02-23 10:36:34 +01:00
Joas Schilling 3a65bdf4d5 Fix dav unit tests 2016-02-23 09:04:15 +01:00
Thomas Müller 4dfdb2720c Case insensitive search in contacts - fixes #22575 2016-02-22 19:47:10 +01:00
Vincent Petry 27544144ce Fix unit tests affected by side effects
The notification tests were not restoring the clock properly, but
indirectly helped other tests pass.

Since now we're restoring the clock properly, the other tests were fixed
to still work.
2016-02-22 17:25:32 +01:00
Vincent Petry 8ea80e114a Accumulate notifications instead of blinking
This makes it possible to display multiple notifications.
If the options.type is set to "error", it will also add a close button.
2016-02-22 17:25:32 +01:00
Joas Schilling a0d0edc754 Make non-public-method protected 2016-02-22 15:26:59 +01:00
Thomas Müller f3b13c7656 Merge pull request #22536 from owncloud/add-integration-tests-for-tags
Add integration tests for tags plus fix permissions
2016-02-22 14:14:51 +01:00
Thomas Müller 7f2b3dbfd2 Merge pull request #22555 from owncloud/jenkins-19978
Show username when writing "Insufficient storage" into owncloud.log
2016-02-22 14:13:59 +01:00
Vincent Petry 642190f333 Fix public page footer position in IE
The content element needs hasLayout, so triggering it with a display
attribute.

Without this, the #content element's height would be as high as the
window's height instead of adjusting itself to its contents' height.
2016-02-22 11:26:50 +01:00
Pierre Jochem 1a8a667863 Solution for Proposal #19974
Show username when writing into owncloud.log
2016-02-22 10:02:45 +01:00
Morris Jobke 3e59c04c7f Fixes pagination in IE
* tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares
* fixes #20044
2016-02-22 08:55:20 +01:00
Lukas Reschke 3bd95cca6b Check if user has permission to create such a tag
Fixes https://github.com/owncloud/core/issues/22512
2016-02-19 20:45:20 +01:00
Thomas Müller f8677628d4 Merge pull request #22503 from owncloud/issue_22500
When (re-)sharing an incomming federated share set the corrent owner
2016-02-19 16:07:43 +01:00
Thomas Müller 5b3a79a28b Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpoint
Add FilesPlugin
2016-02-19 14:44:02 +01:00
Thomas Müller 66f0ba837f Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-url
Fix old calendar dav urls
2016-02-19 13:33:16 +01:00
Bjoern Schiessle 4ef035cc61 make sure that the file name doesn't end with a trailing slash. Can for example happen single files shared across servers 2016-02-19 13:15:09 +01:00
Thomas Müller e987d8cd47 Add FilesPlugin - fixes #22507 2016-02-19 12:37:24 +01:00
Thomas Müller 1106c354ac Merge pull request #22515 from owncloud/webdav_checksum_only_for_files
Only add checksum headers for 'real' files
2016-02-19 12:36:56 +01:00
Joas Schilling b216be8cca Add correct principals for the current user before ACL check 2016-02-19 12:35:33 +01:00
Joas Schilling 4e2f9ce05b Convert the old principal to the new principal before getting calendars 2016-02-19 12:35:33 +01:00
Thomas Müller ffc2950393 Merge pull request #22198 from owncloud/birthday-calendar
Sync a users contacts birthday to the users birthday calendar
2016-02-19 12:33:19 +01:00
Roeland Jago Douma 751d3df469 Only add checksum headers for files
We can only add the checksum header for real ownCloud files (so we have
a fileinfo object etc).
2016-02-19 10:56:43 +01:00
Thomas Müller ae2304f23f Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixes
Fix GDrive handling of office files
2016-02-19 09:13:35 +01:00
Thomas Müller f6e61a296f Merge pull request #22424 from owncloud/add-generic-csrf-protection-to-webdav
Require CSRF token for non WebDAV authenticated requests
2016-02-19 09:13:00 +01:00
Thomas Müller d1ef43481d Merge pull request #22444 from owncloud/fix-federated-share-delete
get the actual user instead of a federated cloud id
2016-02-18 16:44:57 +01:00
Thomas Müller d8de7d1e73 Adding cli command to sync birthday calendar 2016-02-18 14:49:45 +01:00
Thomas Müller 6c4cdddba8 Merge pull request #21610 from owncloud/quota-sharedfile
Fix quota check for single shared files
2016-02-18 14:25:32 +01:00
Vincent Petry e1dbae1467 Properly trigger testRemote after getting a 404 from remote fed share
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
2016-02-18 11:57:03 +01:00
Thomas Müller 981c73000c Prevent deletion of birthday calendar 2016-02-18 11:49:16 +01:00
Thomas Müller c9187cc820 Sync a users contacts birthday to the users birthday calendar 2016-02-18 11:48:34 +01:00
Lukas Reschke 9b3c4e8dc4 Require CSRF token for non WebDAV authenticated requests 2016-02-18 11:18:36 +01:00
Thomas Müller 73d46afc3c Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle
Add index names so Doctrine does not use a too long random string
2016-02-18 11:18:32 +01:00
Thomas Müller bba8875fb5 Merge pull request #22434 from owncloud/share_ocs_api_handle_invalid_shares
OCS Share API should not return invalid shares
2016-02-18 11:17:41 +01:00