summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Closes "New" dropdown when switching categoryMorris Jobke2015-05-191-1/+1
| | | | | * fixes #16394 * return false - stops all following event callbacks
* add primary group users to resultset before cachingArthur Schiwon2015-05-191-1/+2
|
* Fixes returns of group memberships and counting if all members have the ↵Arthur Schiwon2015-05-192-9/+77
| | | | specific groups as primary set.
* Merge pull request #16085 from owncloud/encryption-module-renameThomas Müller2015-05-192-3/+3
|\ | | | | rename to 'Default encryption module'
| * rename to 'Default encryption module'Jan-Christoph Borchardt2015-05-062-3/+3
| |
* | Merge pull request #16354 from owncloud/remove-browser-from-publicwebdavJoas Schilling2015-05-191-1/+2
|\ \ | | | | | | Show a empty response for GET on non-files instead of the Browser Plugin
| * | Show a empty response for GET on non-files instead of the Browser PluginLukas Reschke2015-05-141-1/+2
| | | | | | | | | As discussed in https://github.com/owncloud/core/pull/14151, we missed to add this to the `files_sharing` S2S public WebDAV backend though.
* | | Merge pull request #16181 from owncloud/fix-15982Morris Jobke2015-05-196-14/+78
|\ \ \ | | | | | | | | catch unallowed anonymous auth attempt and show specific error
| * | | handle unallowed auth exception on port detectionArthur Schiwon2015-05-182-6/+20
| | | |
| * | | throw exception on LDAP error 1, which we usually do not see and is pretty ↵Arthur Schiwon2015-05-183-0/+25
| | | | | | | | | | | | | | | | generic. AD uses is for uses not enlisted in the RFC, like on issues with anonymous binds. we also try to guess this case and show a hint.
| * | | catch unallowed anonymous auth attempt and show specific errorArthur Schiwon2015-05-185-9/+34
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-192-0/+2
|/ / /
* | | 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 bin
| * | | 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 value
| * | | 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
|\ \ \ \ | | | | | | | | | | throw exception when LDAP Connection was lost
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Use owner when expiring versions, not the logged in user
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrashJoas Schilling2015-05-152-15/+199
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added rmdir to trashbin storage wrapper
| * | | | | | Added rmdir to trashbin storage wrapperVincent Petry2015-05-122-15/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge pull request #16323 from owncloud/enc_webdav_fixesThomas Müller2015-05-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | some encryption fixes
| * | | | | | | delete all file keys doesn't need the encryption module as parameter; ↵Bjoern Schiessle2015-05-131-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | implement rmdir; getFileKeyDir should also work for part files and complete directories
* | | | | | | [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 storages
| * | | | | 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 #15971
| * | | | | 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 ..." categories
| * | | | | Enable file icons & previews in "Shared ..." categoriesMorris Jobke2015-05-063-1/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | * sharing API returns now the mimetype icon path * file previews are now lazyloaded by default (as the doc says) * fixes #16086
* | | | | [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 folders
| * | | | Fix version rename with files and foldersVincent Petry2015-04-272-31/+174
| | | | | | | | | | | | | | | | | | | | | | | | | - fix moving folder into another folder - fix moving file or folder into shared folder as recipient
* | | | | Merge pull request #15815 from owncloud/unshare-etag-propagateMorris Jobke2015-05-113-80/+51
|\ \ \ \ \ | | | | | | | | | | | | Update etag of direct parent on unshare
| * | | | | Update etag of direct parent on unshareVincent Petry2015-04-283-80/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only call dirname() once instead of twice when propagating etags to the recipient's parent folders.
* | | | | | Merge pull request #16213 from cmeh/patch-5Morris Jobke2015-05-111-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Grammar, removal of line break
| * | | | | | Grammar, removal of line breakChristian Hoffmann2015-05-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.