summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [Share 2.0] Allow moving of sharesRoeland Jago Douma2016-02-026-3/+249
* Merge pull request #22005 from owncloud/share2_getshare_byid_as_recipientRoeland Douma2016-02-025-30/+69
|\
| * getChildren should not return usergroup sharesRoeland Jago Douma2016-02-022-6/+7
| * [Share 2.0] Allow recipient to be passed in to getShareByIdRoeland Jago Douma2016-02-025-24/+62
|/
* Merge pull request #20903 from owncloud/sharing-mount-optionThomas Müller2016-02-023-1/+18
|\
| * adjust js unit testRobin Appelman2016-01-291-0/+1
| * Add mount option to disable sharingRobin Appelman2016-01-292-1/+17
* | Merge pull request #22015 from owncloud/share-no-permissionsThomas Müller2016-02-022-8/+21
|\ \
| * | Block shares that dont have the correct source permissionsRobin Appelman2016-01-292-8/+21
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-0256-82/+38
* | | Merge pull request #22050 from owncloud/fix_sync_addressbookThomas Müller2016-02-011-1/+1
|\ \ \
| * | | pass parameter in the right order to syncRemoteAddressBook()Björn Schießle2016-02-011-1/+1
* | | | Merge pull request #21967 from owncloud/comments-webdavThomas Müller2016-02-0112-8/+590
|\ \ \ \
| * | | | url encode idArthur Schiwon2016-01-291-1/+1
| * | | | introduce comments read marke tables, comes with user cleanup after deletionArthur Schiwon2016-01-297-14/+213
| * | | | standardize datetime outputArthur Schiwon2016-01-291-1/+1
| * | | | Comments WebDAV adjustementsArthur Schiwon2016-01-299-7/+390
| | |_|/ | |/| |
* | | | Merge pull request #21909 from owncloud/files-external-visibilityThomas Müller2016-02-011-1/+1
|\ \ \ \
| * | | | Prevent invalid storages being displayed in the storages viewRobin McCorkell2016-01-261-1/+1
* | | | | Merge pull request #22028 from owncloud/share_hook_expirationdateThomas Müller2016-02-012-28/+134
|\ \ \ \ \
| * | | | | Add Unit testsRoeland Jago Douma2016-01-301-19/+111
| * | | | | Emit hook for expirationDate verificationRoeland Jago Douma2016-01-301-9/+23
* | | | | | Merge pull request #22046 from owncloud/improved_error_handlingThomas Müller2016-02-013-4/+10
|\ \ \ \ \ \
| * | | | | | catch all exceptionsBjörn Schießle2016-02-012-0/+6
| * | | | | | add context to the error messagesBjörn Schießle2016-02-011-4/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #21953 from owncloud/make-enable_avatars-more-robustThomas Müller2016-02-014-4/+4
|\ \ \ \ \ \
| * | | | | | Make enable_avatars setting more robustMorris Jobke2016-01-274-4/+4
* | | | | | | Merge pull request #22045 from owncloud/ext-storage-auth-backend-rewordingThomas Müller2016-02-013-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Reword external storage auth backendsVincent Petry2016-02-013-3/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #22004 from Pookay/patch-1Thomas Müller2016-02-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix the result at the bottom on IEPookay2016-01-291-1/+1
* | | | | | | | Merge pull request #22021 from owncloud/fix-system-addressbook-sync-with-encr...Thomas Müller2016-02-011-2/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Catch potential exceptions when accessing the users avatar - e.g. issues with...Thomas Müller2016-01-291-2/+15
* | | | | | | | | Merge pull request #22034 from matthias-g/patch-1Thomas Müller2016-02-011-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Update explanation of how to enable debug modematthias-g2016-01-301-2/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #21989 from owncloud/make-csp-modifiableThomas Müller2016-02-0115-348/+1316
|\ \ \ \ \ \ \ \
| * | | | | | | | Add public API to give developers the possibility to adjust the global CSP de...Lukas Reschke2016-01-2815-348/+1316
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #22022 from owncloud/share_ocs_filter_path_sharedwithmeThomas Müller2016-02-017-31/+131
|\ \ \ \ \ \ \ \
| * | | | | | | | Add intergration testRoeland Jago Douma2016-01-291-0/+22
| * | | | | | | | Add path filter to OCS Share API ?shared_with_me=trueRoeland Jago Douma2016-01-296-31/+109
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #22012 from owncloud/storagenotavailableexception-codeThomas Müller2016-02-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Default to STATUS_ERROR in StorageNotAvailableExceptionRobin McCorkell2016-01-291-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #21999 from owncloud/properly-decode-cached-objectsThomas Müller2016-02-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [user_ldap] properly decode cached objectsMorris Jobke2016-01-291-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-014-0/+48
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-3148-4/+186
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-3020-0/+50
* | | | | | | | Merge pull request #22018 from owncloud/occ-external-deleteThomas Müller2016-01-292-0/+116
|\ \ \ \ \ \ \ \
| * | | | | | | | Add delete command for external storagesRobin Appelman2016-01-292-0/+116
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #21956 from owncloud/cross-cache-moveThomas Müller2016-01-296-33/+162
|\ \ \ \ \ \ \ \