aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* update cache after move to trashRobin Appelman2015-05-181-0/+2
* dont go trough the view when moving to trashRobin Appelman2015-05-181-12/+27
* Add missing import for the exceptionJoas Schilling2015-05-182-0/+3
* Add a unit test for the decrypt methodJoas Schilling2015-05-181-1/+11
* add l10n to constructorBjoern Schiessle2015-05-183-4/+18
* Merge pull request #16404 from owncloud/enc_encrypt_files_in_trashVincent Petry2015-05-182-1/+29
|\
| * also encrypt files in trash binBjoern Schiessle2015-05-182-1/+29
* | a new approach to display the error messageBjoern Schiessle2015-05-186-11/+92
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-184-0/+28
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-176-0/+6
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-162-0/+2
* Merge pull request #16176 from owncloud/fix-provisioning-api-set-quotaVincent Petry2015-05-152-8/+31
|\
| * Validate the quota value to be a correct valueThomas Müller2015-05-072-8/+31
* | Merge pull request #15811 from owncloud/exception-on-lost-ldap-connectionThomas Müller2015-05-152-0/+196
|\ \
| * | add integration test to ensure correct behaviour on lost connectionsArthur Schiwon2015-04-241-0/+192
| * | throw exception when LDAP Connection was lostArthur Schiwon2015-04-221-0/+4
* | | Merge pull request #16337 from owncloud/versions-expireforownerJoas Schilling2015-05-152-12/+97
|\ \ \
| * | | Added unit tests for versions storingVincent Petry2015-05-151-4/+86
| * | | Use owner when expiring versions, not the logged in userVincent Petry2015-05-131-8/+11
* | | | Fix restoring files from trash with unique nameVincent Petry2015-05-152-6/+338
* | | | Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrashJoas Schilling2015-05-152-15/+199
|\ \ \ \
| * | | | Added rmdir to trashbin storage wrapperVincent Petry2015-05-122-15/+199
* | | | | Merge pull request #16323 from owncloud/enc_webdav_fixesThomas Müller2015-05-151-1/+1
|\ \ \ \ \
| * | | | | delete all file keys doesn't need the encryption module as parameter; impleme...Bjoern Schiessle2015-05-131-1/+1
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1512-2/+44
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1410-2/+10
|/ / / /
* | | | Merge pull request #16284 from owncloud/shared-storage-viewLukas Reschke2015-05-131-20/+21
|\ \ \ \
| * | | | dont go trough the view when renaming/copying on shared storagesRobin Appelman2015-05-121-20/+21
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1382-68/+158
|/ / / /
* | | | Merge pull request #16277 from owncloud/fix-15971Morris Jobke2015-05-122-4/+1
|\ \ \ \
| * | | | remove superflous button. fixes #15971Arthur Schiwon2015-05-122-4/+1
* | | | | Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-viewJan-Christoph Borchardt2015-05-123-1/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Enable file icons & previews in "Shared ..." categoriesMorris Jobke2015-05-063-1/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1226-26/+16
| |/ / / |/| | |
* | | | Merge pull request #15881 from owncloud/share-moveversionsproperlyVincent Petry2015-05-112-31/+174
|\ \ \ \
| * | | | Fix version rename with files and foldersVincent Petry2015-04-272-31/+174
* | | | | Merge pull request #15815 from owncloud/unshare-etag-propagateMorris Jobke2015-05-113-80/+51
|\ \ \ \ \
| * | | | | Update etag of direct parent on unshareVincent Petry2015-04-283-80/+51
* | | | | | Merge pull request #16213 from cmeh/patch-5Morris Jobke2015-05-111-2/+1
|\ \ \ \ \ \
| * | | | | | Grammar, removal of line breakChristian Hoffmann2015-05-091-2/+1
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-118-2/+32
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1030-18/+100
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0992-446/+98
* | | | | | improved admin settingsBjoern Schiessle2015-05-083-63/+90
* | | | | | Merge pull request #16170 from owncloud/fix-15621Thomas Müller2015-05-081-6/+9
|\ \ \ \ \ \
| * | | | | | drop global file cache support, fixes #15621Arthur Schiwon2015-05-071-6/+9
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #16183 from owncloud/fix-16147Thomas Müller2015-05-081-2/+2
|\ \ \ \ \ \
| * | | | | | check optional parameter before using it, fixes #16147Arthur Schiwon2015-05-071-2/+2
| |/ / / / /
* | | | | | Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pat...Morris Jobke2015-05-082-1/+15
|\ \ \ \ \ \
| * | | | | | Add a test for getting the versions of an empty pathJoas Schilling2015-05-071-1/+12