summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtagsThomas Müller2016-02-0213-42/+875
|\
| * Fix path matchJoas Schilling2016-02-022-2/+6
| * Fix IManager::isFormattingFilteredObject()Joas Schilling2016-02-021-5/+4
| * Add activities when a tag is (un-)assignedJoas Schilling2016-02-024-20/+175
| * Add activities for admins when a tag is created/updated/deletedJoas Schilling2016-02-023-0/+402
| * App needs to be of type logging to be able to have activitiesJoas Schilling2016-02-021-1/+4
| * Dispatch events when tags are added/updated/deletedJoas Schilling2016-02-024-14/+161
| * Dispatch some events when tags are un-/assignedJoas Schilling2016-02-025-22/+145
* | Merge pull request #22055 from owncloud/systemtags-checkfileidownerThomas Müller2016-02-026-13/+109
|\ \
| * | Make sure user has access to file for system tag operationsVincent Petry2016-02-016-13/+109
* | | Merge pull request #22057 from owncloud/share2_update_hashThomas Müller2016-02-022-1/+24
|\ \ \
| * | | Update old password hashed for link shares on accessRoeland Jago Douma2016-02-012-1/+24
| |/ /
* | | Merge pull request #21988 from owncloud/allow-search-in-synced-addressbooksThomas Müller2016-02-028-249/+41
|\ \ \
| * | | Filter contacts from the local system addressbook - remote share with local u...Thomas Müller2016-02-022-0/+7
| * | | PHP 5.4 compatibilityThomas Müller2016-02-021-1/+2
| * | | In some cases $contact['CLOUD'] is not an arrayThomas Müller2016-02-021-1/+5
| * | | Register all system address books to the contacts managerThomas Müller2016-02-023-6/+27
| * | | The local address book is replaced now by the system addressbook as part of t...Thomas Müller2016-02-023-241/+0
* | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 07:39:01 +0000