Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update cache after move to trash | Robin Appelman | 2015-05-18 | 1 | -0/+2 |
* | dont go trough the view when moving to trash | Robin Appelman | 2015-05-18 | 1 | -12/+27 |
* | Add missing import for the exception | Joas Schilling | 2015-05-18 | 2 | -0/+3 |
* | Add a unit test for the decrypt method | Joas Schilling | 2015-05-18 | 1 | -1/+11 |
* | add l10n to constructor | Bjoern Schiessle | 2015-05-18 | 3 | -4/+18 |
* | Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash | Vincent Petry | 2015-05-18 | 2 | -1/+29 |
|\ | |||||
| * | also encrypt files in trash bin | Bjoern Schiessle | 2015-05-18 | 2 | -1/+29 |
* | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 6 | -11/+92 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-18 | 4 | -0/+28 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-17 | 6 | -0/+6 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-16 | 2 | -0/+2 |
* | Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota | Vincent Petry | 2015-05-15 | 2 | -8/+31 |
|\ | |||||
| * | Validate the quota value to be a correct value | Thomas Müller | 2015-05-07 | 2 | -8/+31 |
* | | Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection | Thomas Müller | 2015-05-15 | 2 | -0/+196 |
|\ \ | |||||
| * | | add integration test to ensure correct behaviour on lost connections | Arthur Schiwon | 2015-04-24 | 1 | -0/+192 |
| * | | throw exception when LDAP Connection was lost | Arthur Schiwon | 2015-04-22 | 1 | -0/+4 |
* | | | Merge pull request #16337 from owncloud/versions-expireforowner | Joas Schilling | 2015-05-15 | 2 | -12/+97 |
|\ \ \ | |||||
| * | | | Added unit tests for versions storing | Vincent Petry | 2015-05-15 | 1 | -4/+86 |
| * | | | Use owner when expiring versions, not the logged in user | Vincent Petry | 2015-05-13 | 1 | -8/+11 |
* | | | | Fix restoring files from trash with unique name | Vincent Petry | 2015-05-15 | 2 | -6/+338 |
* | | | | Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrash | Joas Schilling | 2015-05-15 | 2 | -15/+199 |
|\ \ \ \ | |||||
| * | | | | Added rmdir to trashbin storage wrapper | Vincent Petry | 2015-05-12 | 2 | -15/+199 |
* | | | | | Merge pull request #16323 from owncloud/enc_webdav_fixes | Thomas Müller | 2015-05-15 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | delete all file keys doesn't need the encryption module as parameter; impleme... | Bjoern Schiessle | 2015-05-13 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-15 | 12 | -2/+44 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-14 | 10 | -2/+10 |
|/ / / / | |||||
* | | | | Merge pull request #16284 from owncloud/shared-storage-view | Lukas Reschke | 2015-05-13 | 1 | -20/+21 |
|\ \ \ \ | |||||
| * | | | | dont go trough the view when renaming/copying on shared storages | Robin Appelman | 2015-05-12 | 1 | -20/+21 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-13 | 82 | -68/+158 |
|/ / / / | |||||
* | | | | Merge pull request #16277 from owncloud/fix-15971 | Morris Jobke | 2015-05-12 | 2 | -4/+1 |
|\ \ \ \ | |||||
| * | | | | remove superflous button. fixes #15971 | Arthur Schiwon | 2015-05-12 | 2 | -4/+1 |
* | | | | | Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-view | Jan-Christoph Borchardt | 2015-05-12 | 3 | -1/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Enable file icons & previews in "Shared ..." categories | Morris Jobke | 2015-05-06 | 3 | -1/+4 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-12 | 26 | -26/+16 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #15881 from owncloud/share-moveversionsproperly | Vincent Petry | 2015-05-11 | 2 | -31/+174 |
|\ \ \ \ | |||||
| * | | | | Fix version rename with files and folders | Vincent Petry | 2015-04-27 | 2 | -31/+174 |
* | | | | | Merge pull request #15815 from owncloud/unshare-etag-propagate | Morris Jobke | 2015-05-11 | 3 | -80/+51 |
|\ \ \ \ \ | |||||
| * | | | | | Update etag of direct parent on unshare | Vincent Petry | 2015-04-28 | 3 | -80/+51 |
* | | | | | | Merge pull request #16213 from cmeh/patch-5 | Morris Jobke | 2015-05-11 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Grammar, removal of line break | Christian Hoffmann | 2015-05-09 | 1 | -2/+1 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-11 | 8 | -2/+32 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-10 | 30 | -18/+100 |
|/ / / / / / | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-09 | 92 | -446/+98 |
* | | | | | | improved admin settings | Bjoern Schiessle | 2015-05-08 | 3 | -63/+90 |
* | | | | | | Merge pull request #16170 from owncloud/fix-15621 | Thomas Müller | 2015-05-08 | 1 | -6/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | drop global file cache support, fixes #15621 | Arthur Schiwon | 2015-05-07 | 1 | -6/+9 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #16183 from owncloud/fix-16147 | Thomas Müller | 2015-05-08 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | check optional parameter before using it, fixes #16147 | Arthur Schiwon | 2015-05-07 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pat... | Morris Jobke | 2015-05-08 | 2 | -1/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add a test for getting the versions of an empty path | Joas Schilling | 2015-05-07 | 1 | -1/+12 |