Commit Graph

10432 Commits

Author SHA1 Message Date
Jenkins for ownCloud 744a9f2c78 [tx-robot] updated from transifex 2015-05-16 01:54:47 -04:00
Vincent Petry 246000f799 Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota
Validate the quota value to be a correct value
2015-05-15 18:07:13 +02:00
Thomas Müller 8e61ad0872 Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection
throw exception when LDAP Connection was lost
2015-05-15 17:32:07 +02:00
Joas Schilling 03e26a0fbe Merge pull request #16337 from owncloud/versions-expireforowner
Use owner when expiring versions, not the logged in user
2015-05-15 15:02:26 +02:00
Vincent Petry f86699cd48 Fix restoring files from trash with unique name
When restoring a file, a unique name needs to be generated if a file
with the same name already exists.

Also fixed the restore() method to return false if the file to restore
does not exist.

Added unit tests to cover restore cases.
2015-05-15 12:42:27 +02:00
Vincent Petry f8a4cc0284 Added unit tests for versions storing 2015-05-15 12:24:34 +02:00
Joas Schilling e1923bac07 Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrash
Added rmdir to trashbin storage wrapper
2015-05-15 11:16:13 +02:00
Thomas Müller 937306b416 Merge pull request #16323 from owncloud/enc_webdav_fixes
some encryption fixes
2015-05-15 10:38:22 +02:00
Jenkins for ownCloud 49c4ee98b4 [tx-robot] updated from transifex 2015-05-15 01:54:49 -04:00
Jenkins for ownCloud 1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Bjoern Schiessle ccbefb6e75 delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories 2015-05-13 19:06:23 +02:00
Vincent Petry 033b3dac92 Use owner when expiring versions, not the logged in user 2015-05-13 18:40:35 +02:00
Lukas Reschke 5941e826b8 Merge pull request #16284 from owncloud/shared-storage-view
dont go trough the view when renaming/copying on shared storages
2015-05-13 10:37:04 +02:00
Jenkins for ownCloud 504586aec6 [tx-robot] updated from transifex 2015-05-13 01:55:14 -04:00
Robin Appelman 3b1dde7005 dont go trough the view when renaming/copying on shared storages 2015-05-12 17:09:37 +02:00
Morris Jobke 44091a1a12 Merge pull request #16277 from owncloud/fix-15971
remove superflous button. fixes #15971
2015-05-12 15:54:49 +02:00
Jan-Christoph Borchardt 46e4d8818c Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-view
Enable file icons & previews in "Shared ..." categories
2015-05-12 15:17:43 +02:00
Arthur Schiwon acafc8ca46 remove superflous button. fixes #15971 2015-05-12 14:54:05 +02:00
Vincent Petry beb6a38d85 Added rmdir to trashbin storage wrapper
This makes sure that folders are moved to trash when deleted with
rmdir() instead of unlink().

This happens for example when deleting a folder over WebDAV.
The web UI uses unlink() so it wasn't affected.
2015-05-12 11:09:02 +02:00
Jenkins for ownCloud deeeca69fe [tx-robot] updated from transifex 2015-05-12 01:55:10 -04:00
Vincent Petry 20d2d8d3dd Merge pull request #15881 from owncloud/share-moveversionsproperly
Fix version rename with files and folders
2015-05-11 18:24:34 +02:00
Morris Jobke 90d8e4bc00 Merge pull request #15815 from owncloud/unshare-etag-propagate
Update etag of direct parent on unshare
2015-05-11 13:42:20 +02:00
Morris Jobke f057efc42e Merge pull request #16213 from cmeh/patch-5
Grammar, removal of line break
2015-05-11 09:18:45 +02:00
Jenkins for ownCloud a331f6b83e [tx-robot] updated from transifex 2015-05-11 01:54:43 -04:00
Jenkins for ownCloud 52fc45e6e3 [tx-robot] updated from transifex 2015-05-10 01:56:13 -04:00
Christian Hoffmann 6441721626 Grammar, removal of line break
* Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17.
* Removed line break from line 17 to line 18.
2015-05-09 11:31:21 +02:00
Jenkins for ownCloud 6f5854a8de [tx-robot] updated from transifex 2015-05-09 01:55:35 -04:00
Bjoern Schiessle 4a450c9d0d improved admin settings 2015-05-08 11:41:38 +02:00
Thomas Müller e4c05acf94 Merge pull request #16170 from owncloud/fix-15621
drop global file cache support, fixes #15621
2015-05-08 11:06:00 +02:00
Thomas Müller dfd451777c Merge pull request #16183 from owncloud/fix-16147
check optional parameter before using it, fixes #16147
2015-05-08 10:47:33 +02:00
Morris Jobke 1fbf9c3d71 Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pathinfo
Do not run method when the path is empty
2015-05-08 09:49:51 +02:00
Jenkins for ownCloud ff0faacf0b [tx-robot] updated from transifex 2015-05-08 01:54:52 -04:00
Arthur Schiwon f2d23d7f02 check optional parameter before using it, fixes #16147 2015-05-07 22:18:29 +02:00
Thomas Müller 15d134124b Validate the quota value to be a correct value 2015-05-07 17:56:13 +02:00
Joas Schilling 2b092f2e93 Add a test for getting the versions of an empty path 2015-05-07 16:02:35 +02:00
Arthur Schiwon 57e8b76f48 drop global file cache support, fixes #15621 2015-05-07 14:52:44 +02:00
Joas Schilling 05fe2006ee Do not run method when the path is empty 2015-05-07 14:31:21 +02:00
Morris Jobke 12b24ee567 Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page
Display the module settings in the list of the encryption modules
2015-05-07 10:44:03 +02:00
Jenkins for ownCloud 3dee907b70 [tx-robot] updated from transifex 2015-05-07 01:56:44 -04:00
Morris Jobke b1713b2f75 Enable file icons & previews in "Shared ..." categories
* sharing API returns now the mimetype icon path
* file previews are now lazyloaded by default (as the doc says)
* fixes #16086
2015-05-06 18:32:52 +02:00
Arthur Schiwon 71e6644ec8 fix filter index on selected groups is updated too early 2015-05-06 15:34:44 +02:00
Arthur Schiwon 795a48d45c fix broken group presentation in selected groups list 2015-05-06 15:29:36 +02:00
Jenkins for ownCloud 910146824e [tx-robot] updated from transifex 2015-05-06 01:55:19 -04:00
Arthur Schiwon 0e7fd82e89 cleanup 2015-05-05 14:21:12 +02:00
Arthur Schiwon 1c791e6000 not only send them back but also apply defaults to a new configuration. Fixes #15933 2015-05-05 14:20:58 +02:00
Joas Schilling efce8ff905 Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller
Fix PHPDoc for the ext. share controller
2015-05-05 10:52:28 +02:00
Björn Schießle 2ce01ee0bf Merge pull request #15938 from owncloud/enc_update_recovery_share_key
[encryption] check recovery key setting for the correct user
2015-05-05 10:48:09 +02:00
Jenkins for ownCloud b60dcd91bb [tx-robot] updated from transifex 2015-05-05 01:55:36 -04:00
Lukas Reschke d9746d8abd Fix PHPDoc for the ext. share controller 2015-05-04 18:06:16 +02:00
Björn Schießle ed16127a8d Merge pull request #16026 from owncloud/enc_ux_improvements
[encryption] some small ux improvements
2015-05-04 17:40:05 +02:00