Commit Graph

2139 Commits

Author SHA1 Message Date
Jenkins for ownCloud 55f4d0eea1 [tx-robot] updated from transifex 2015-07-05 01:54:50 -04:00
Thomas Müller d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Vincent Petry cc373ab89a Merge pull request #15470 from rullzer/files_sharing_getUrlContent
Move away from private static function OC_Util::getUrlContent
2015-07-03 17:47:46 +02:00
Morris Jobke 9da10788bc Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailable
Do not show static share owner if not available
2015-07-03 09:31:40 +02:00
Jenkins for ownCloud b8f5b2c47a [tx-robot] updated from transifex 2015-07-03 01:54:57 -04:00
Morris Jobke a3df41ddb6 Merge pull request #17159 from owncloud/fix-duplicate-id
remove duplicate ID in HTML template for public shares
2015-07-02 17:50:39 +02:00
Vincent Petry 71ae96bb56 Do not show static share owner if not available
In some corner cases, an outgoing share exists but sharing is not
allowed for the current user. This would cause the file list to break
because the static text could not be rendered as the owner was
undefined.
2015-07-02 16:38:20 +02:00
Vincent Petry e65034e4bc Do not register JS share plugin if core sharing API is disabled 2015-07-02 14:56:33 +02:00
Morris Jobke f5c57e076e Merge pull request #17077 from owncloud/files-scan-absolute-path
fix getting mount points when passing a path to the files:scan command
2015-07-02 13:02:20 +02:00
Vincent Petry aedf4848f7 Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block
Fix duplicated line in doc block
2015-07-02 13:00:22 +02:00
Joas Schilling c7968d202f Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified
[Master] Delete OCS ID from DB if none is specified
2015-07-02 12:37:31 +02:00
Joas Schilling bfcb8ffeb3 Merge pull request #17246 from owncloud/share-lock-owner-parent
lock parent folders for the owner when locking a shared file as recipient
2015-07-02 10:38:08 +02:00
Joas Schilling a6ea91996c Fix duplicated line in doc block 2015-07-02 10:24:16 +02:00
Lukas Reschke b100036457 Bump versions 2015-07-02 09:18:41 +02:00
Lukas Reschke 68f8717056 [master] Remove OCS IDs
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307

Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
2015-07-02 08:45:16 +02:00
Jenkins for ownCloud d2e1cae331 [tx-robot] updated from transifex 2015-07-02 01:59:26 -04:00
Vincent Petry 9c06975bd5 Fix scanFile signature to avoid boring warning 2015-07-01 16:29:11 +02:00
Robin Appelman 3c0be7d126 only lock the parent folders 2015-07-01 15:10:25 +02:00
Robin Appelman d6f56ea609 lock parent folders for the owner when locking a shared file as recipient 2015-07-01 15:10:22 +02:00
Vincent Petry 5d3aa36355 Catch more error codes thrown by federated shares
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.

This prevents unpredictable error codes to block access to unrelated
folders needlessly.
2015-07-01 11:14:03 +02:00
Morris Jobke 8f05d4b662 Merge pull request #16535 from rullzer/ocs_share_api_url
OCS Share API link shares now always have an url
2015-07-01 08:54:48 +02:00
Morris Jobke 044d2ece07 Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util
Move core apps from OC_Log::write to OCP\Util
2015-07-01 08:53:16 +02:00
Morris Jobke f25b71f70e Merge pull request #15475 from rullzer/files_sharing_OCP_DB
Move files sharing app (mostly) to OCP\DB
2015-07-01 08:53:03 +02:00
Thomas Müller 372a9afabe Fixing ctor calls and ctor itself to not break usage in calendar and contacts ..... 2015-06-29 15:54:05 +02:00
Robin Appelman abb0c728ef handle error during setup 2015-06-29 14:06:32 +02:00
Vincent Petry b55f71ee03 Merge pull request #17083 from owncloud/share-etag-update-target
take share target into account when updating recipient etags
2015-06-29 09:10:37 +02:00
Jenkins for ownCloud 733d59ed44 [tx-robot] updated from transifex 2015-06-29 01:54:44 -04:00
Jenkins for ownCloud 4d565a8447 [tx-robot] updated from transifex 2015-06-28 01:55:19 -04:00
Lukas Reschke d1f0ff372e Merge pull request #17163 from owncloud/update-licenses
Update license headers
2015-06-27 20:22:23 +02:00
Jenkins for ownCloud 28c223edc6 [tx-robot] updated from transifex 2015-06-27 01:55:58 -04:00
Olivier Paroz b30515ddda Signature of overriding method should match the parent 2015-06-26 17:45:04 +02:00
Vincent Petry 56d9df34cb Unit test for etag update on custom share folder 2015-06-26 16:32:28 +02:00
Björn Schießle b318b9cf17 Merge pull request #17008 from owncloud/fix-17006
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
Thomas Müller 9558562883 Merge pull request #17082 from owncloud/shared-etag-propagate-file
Fix etag propagation for single file shares
2015-06-26 12:36:17 +02:00
Robin Appelman 0128a86df1 add some docs 2015-06-25 14:29:40 +02:00
Morris Jobke f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Morris Jobke 5cb1e20214 remove duplicate ID in HTML template for public shares 2015-06-25 10:13:56 +02:00
Jenkins for ownCloud dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Robin Appelman c87ab65081 fix etag propagation for single file shares 2015-06-24 18:16:03 +02:00
Robin Appelman f847d9409e add unit test for single file share etag propagation 2015-06-24 18:16:03 +02:00
Morris Jobke 5f59393b30 Merge pull request #17110 from owncloud/share-error-handling
[sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:34 +02:00
Roeland Jago Douma 6c3da1ec90 Added unit test to verify link password removeal 2015-06-24 12:38:33 +02:00
Jenkins for ownCloud ceb80ac123 [tx-robot] updated from transifex 2015-06-24 01:55:55 -04:00
Morris Jobke 4f2f8a6f28 [sharing] handle shares of users that aren't available anymore
* properly handle the case where an abandoned share is left and
  simply skip it
2015-06-23 18:22:36 +02:00
Jenkins for ownCloud 3cad0d4ed2 [tx-robot] updated from transifex 2015-06-23 01:56:15 -04:00
Robin Appelman 5e1865530b take share target into account when updating recipient etags 2015-06-22 18:21:54 +02:00
Joas Schilling 738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Jenkins for ownCloud c77e44117d [tx-robot] updated from transifex 2015-06-22 01:55:00 -04:00
Jenkins for ownCloud 59513ac377 [tx-robot] updated from transifex 2015-06-21 01:55:06 -04:00
Jenkins for ownCloud 183bd6dd49 [tx-robot] updated from transifex 2015-06-20 01:55:10 -04:00