Commit graph

1967 commits

Author SHA1 Message Date
Morris Jobke
9cb260d310 Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-usage
Fixing OCS API namespace usage
2015-04-20 09:43:19 +02:00
Jenkins for ownCloud
fd3c1484ad [tx-robot] updated from transifex 2015-04-19 01:54:41 -04:00
Morris Jobke
e837927ad5 fix followup issues with unneeded parameters 2015-04-18 17:02:39 +02:00
Joas Schilling
3f3f8c2f99 Fix usage of deprecated private constants 2015-04-18 10:30:02 +02:00
Jenkins for ownCloud
37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Jenkins for ownCloud
da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Jenkins for ownCloud
8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Jenkins for ownCloud
7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Morris Jobke
82cab25762 Merge pull request #13360 from owncloud/cross-storage-move
Proper copy/move between multiple local storages
2015-04-14 14:35:08 +02:00
Robin Appelman
0f21303b75 a bit more phpdoc 2015-04-14 12:35:53 +02:00
Robin Appelman
f605c98531 Fix cross storage move with shared storages 2015-04-13 17:10:05 +02:00
Robin Appelman
8688660825 check that we know the parent 2015-04-13 17:10:02 +02:00
Robin Appelman
6b5daca7b7 check for source cache 2015-04-13 17:10:02 +02:00
Robin Appelman
d4c91dc835 add missing return for shared 2015-04-13 15:13:03 +02:00
Robin Appelman
d16ee4138d Fix test 2015-04-13 15:13:03 +02:00
Robin Appelman
d726db7459 Implement move/copyFromStorage for shared storage 2015-04-13 15:13:03 +02:00
Vincent Petry
2822d0579e Properly add trailing slash to mount point
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
Morris Jobke
20a1a110de Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2
Fix master unit test: Clear leftover shares from other tests
2015-04-10 15:42:16 +02:00
Vincent Petry
4a225aa12c Clear leftover shares from other tests 2015-04-10 14:53:17 +02:00
Vincent Petry
b51b5b64e6 Fix converting Guzzle error codes in s2s storage 2015-04-10 12:12:05 +02:00
Vincent Petry
73afca6207 Catch more exceptions when connecting to remote DAV server
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
Vincent Petry
4feb97d8e4 Properly catch guzzle 503 when querying share info 2015-04-09 18:55:28 +02:00
Vincent Petry
2865f09984 Merge pull request #15282 from owncloud/keepsharerelationshipondelete
Keep shares when deleting shared folders
2015-04-09 18:10:17 +02:00
Vincent Petry
5803a1f5f7 Remove trashbin storage wrapper when disabling it for tests 2015-04-09 15:02:24 +02:00
Vincent Petry
08a9d1d2dc Remove unused $toRemove 2015-04-09 12:34:19 +02:00
Jan-Christoph Borchardt
65dc958418 add admin documentation hints to Federated Cloud Sharing and cron 2015-04-09 12:07:05 +02:00
Vincent Petry
461302244e Keep shares when deleting shared folders
The share entries will be linked with the fileid while they are kept in
the trashbin.

In the future a background just will scrape orphaned shares and delete
them.
2015-04-09 10:16:40 +02:00
Morris Jobke
56f1ffe820 Merge pull request #14676 from owncloud/deleteorphanedshares
Delete orphaned shares in a background job
2015-04-09 00:18:53 +02:00
Morris Jobke
103d451459 Merge pull request #14987 from rullzer/ocs_password_fix2
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Vincent Petry
4acf6747d2 Disable trashbin when testing orphaned shares deletion job 2015-04-08 13:04:06 +02:00
Vincent Petry
9c3893ce69 Added FIXME about registering jobs in apps.php 2015-04-08 12:09:42 +02:00
Vincent Petry
17b141337a Delete orphaned shares in a background job 2015-04-08 10:47:55 +02:00
Bjoern Schiessle
fac7ec3fc4 fix re-shares with encryption 2015-04-07 13:30:30 +02:00
Bjoern Schiessle
60d8a39f03 store init status per user 2015-04-07 13:30:30 +02:00
Bjoern Schiessle
8b1a12a224 use loginHelper from base class 2015-04-07 13:30:30 +02:00
Bjoern Schiessle
391fab35f0 reset storage for each unit test 2015-04-07 13:30:30 +02:00
Bjoern Schiessle
de4ec21c39 work arround to make sure that shares are initialized only once 2015-04-07 13:30:30 +02:00
Thomas Müller
00338f9dca Removing files_encryption left overs 2015-04-07 13:30:28 +02:00
Bjoern Schiessle
0eee3a2618 remove unencrypted_size from the cache, size will contain the unencrypted size 2015-04-07 13:30:28 +02:00
Roeland Jago Douma
2b81d0f237 Move core apps from private to public functions
Apps still use OC_Helper and OC_Util functions even when public ones are
already available. Sometimes the public one is even used in the same
file.
2015-04-01 12:06:04 +02:00
Joas Schilling
4c9c73bef9 Correct the app name for sharing events 2015-03-30 15:14:31 +02:00
Roeland Jago Douma
b0aa17b13f OCS Fixes to allow setting of password without removing additional settings
- Added setPassword to share.php
- Fixed OCS API call
- Added unit tests
2015-03-30 14:00:50 +02:00
Morris Jobke
cfe241a959 Merge pull request #13964 from rullzer/capabilities
Add OCS sharing info to capabilities - take 2
2015-03-30 10:06:05 +02:00
Morris Jobke
00b2be11dd Merge pull request #15239 from owncloud/see-no-evil
Move federated cloud sharing, files externals and updater to special pos...
2015-03-30 09:05:31 +02:00
Thomas Müller
4d12c4a38b Merge pull request #13938 from owncloud/deprecate-iappconfig
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
Jan-Christoph Borchardt
908538d863 fix layout for Sharing settings 2015-03-27 09:38:13 +01:00
Joas Schilling
495562f40c Move federated cloud sharing, files externals and updater to special positions 2015-03-27 09:38:09 +01:00
Morris Jobke
d082e37270 Merge pull request #15244 from owncloud/use_default_share_folder
always fall back to default share folder
2015-03-26 22:39:04 +01:00
Morris Jobke
e8109f0bc3 Merge pull request #13802 from owncloud/share-partfilepermissions
Fix share permission checks
2015-03-26 22:01:05 +01:00
Bjoern Schiessle
a3592534ef always fall back to default share folder 2015-03-26 21:56:44 +01:00