aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtagsThomas Müller2016-02-024-1/+561
|\
| * Fix path matchJoas Schilling2016-02-022-2/+6
| * Add activities when a tag is (un-)assignedJoas Schilling2016-02-023-20/+171
| * 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
* | 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
* | | 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
* | | Merge pull request #20903 from owncloud/sharing-mount-optionThomas Müller2016-02-022-1/+8
|\ \ \
| * | | adjust js unit testRobin Appelman2016-01-291-0/+1
| * | | Add mount option to disable sharingRobin Appelman2016-01-291-1/+7
* | | | Merge pull request #22015 from owncloud/share-no-permissionsThomas Müller2016-02-021-6/+18
|\ \ \ \ | |_|_|/ |/| | |
| * | | Block shares that dont have the correct source permissionsRobin Appelman2016-01-291-6/+18
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-0248-82/+12
* | | | 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-014-2/+281
|\ \ \ \
| * | | | url encode idArthur Schiwon2016-01-291-1/+1
| * | | | standardize datetime outputArthur Schiwon2016-01-291-1/+1
| * | | | Comments WebDAV adjustementsArthur Schiwon2016-01-294-2/+281
| | |_|/ | |/| |
* | | | 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 #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 #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 #22022 from owncloud/share_ocs_filter_path_sharedwithmeThomas Müller2016-02-011-7/+11
|\ \ \ \ \ \
| * | | | | | Add path filter to OCS Share API ?shared_with_me=trueRoeland Jago Douma2016-01-291-7/+11
| |/ / / / /
* | | | | | 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-012-0/+44
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-3118-0/+32
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-304-0/+6
* | | | | | 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
| | |_|_|_|/ | |/| | | |
* | | | | | inject loggerRobin Appelman2016-01-296-11/+33
* | | | | | Dont set null values when validating storage definitionRobin Appelman2016-01-293-6/+12
* | | | | | minor fixesRobin Appelman2016-01-293-7/+11
* | | | | | set auth mechanism in testsRobin Appelman2016-01-291-0/+1
* | | | | | remove custom controler for user provided password authRobin Appelman2016-01-297-141/+97
* | | | | | dont show user provided auth as option for personal mountsRobin Appelman2016-01-293-3/+5
* | | | | | Allow setting user provided credentials from the personal settings pageRobin Appelman2016-01-296-44/+180