summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Port of test_ldap_2nddispname to masterArthur Schiwon2016-02-0311-15/+209
* Merge pull request #21997 from owncloud/checksumsThomas Müller2016-02-039-10/+82
|\
| * Add store/retrieve checksumsRoeland Jago Douma2016-02-039-10/+82
* | Merge pull request #22081 from owncloud/mount-cache-invalid-storageThomas Müller2016-02-031-1/+1
|\ \
| * | filter invalid storages from the mount cache earlyRobin Appelman2016-02-021-1/+1
* | | Merge pull request #22084 from owncloud/configphp-fixesThomas Müller2016-02-031-15/+15
|\ \ \
| * | | small corrections; Web is capitalized, webroot is one lowercase wordCarla Schroder2016-02-031-15/+15
* | | | Merge pull request #22090 from owncloud/skip-migration-tests-settingThomas Müller2016-02-033-0/+21
|\ \ \ \
| * | | | setting to skip migration tests by defaultMorris Jobke2016-02-033-0/+21
| | |_|/ | |/| |
* | | | Merge pull request #21772 from owncloud/occ-external-applicableThomas Müller2016-02-034-0/+432
|\ \ \ \
| * | | | Add occ command to manage applicablesRobin Appelman2016-02-024-0/+432
* | | | | Merge pull request #21961 from owncloud/comments-guiThomas Müller2016-02-0318-24/+940
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add comments app to expected apps in testVincent Petry2016-02-021-1/+2
| * | | | Fixed report nameVincent Petry2016-02-021-2/+2
| * | | | Added JS unit tests for commentsVincent Petry2016-02-025-6/+320
| * | | | Add spinner when submitting commentsVincent Petry2016-02-022-7/+32
| * | | | Fix parsing empty Webdav property nodesVincent Petry2016-02-022-2/+2
| * | | | Fix formatting messages with newlinesVincent Petry2016-02-021-2/+11
| * | | | Better comments pagination logicVincent Petry2016-02-021-11/+9
| * | | | Improve comments style, add avatarsVincent Petry2016-02-023-22/+104
| * | | | Expose display name in JS sideVincent Petry2016-02-022-1/+33
| * | | | Use last comment's time for paginationVincent Petry2016-02-021-1/+1
| * | | | Add pagination support for comments GUIVincent Petry2016-02-024-36/+76
| * | | | Improve comment date formatVincent Petry2016-02-021-3/+10
| * | | | Comments GUIVincent Petry2016-02-029-0/+408
| | |_|/ | |/| |
* | | | Merge pull request #22059 from owncloud/comments-readmark-davThomas Müller2016-02-038-10/+154
|\ \ \ \
| * | | | update routine was lacking where statements :see_no_evil:Arthur Schiwon2016-02-021-1/+7
| * | | | set read marker via proppatch against entityArthur Schiwon2016-02-013-1/+43
| * | | | Return isUnread property per commentArthur Schiwon2016-02-015-8/+104
* | | | | Merge pull request #22053 from owncloud/files_external-params-flagsThomas Müller2016-02-034-47/+83
|\ \ \ \ \
| * | | | | Remove magic flags from files_external backend paramsRobin Appelman2016-02-024-47/+83
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-0316-4/+46
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #22076 from owncloud/activities-yes-default-enabled-noMorris Jobke2016-02-021-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Don't enable tag activities by defaultJoas Schilling2016-02-021-1/+1
|/ / / /
* | | | Merge pull request #22054 from vincchan/vincchan/fix#20199Thomas Müller2016-02-026-36/+83
|\ \ \ \
| * | | | changed variables to lowercaseVincent Chan2016-02-021-5/+5
| * | | | Move data protection check to javascriptVincent Chan2016-02-016-36/+83
* | | | | Merge pull request #22023 from owncloud/interruptable-commandsThomas Müller2016-02-023-61/+55
|\ \ \ \ \
| * | | | | Add startup warning that the PCNTL extensions are missingThomas Müller2016-02-011-0/+4
| * | | | | Move signal handling to the base class to allow other commands to reuse this ...Thomas Müller2016-02-012-61/+51
* | | | | | Merge pull request #22013 from owncloud/share2_moveshareThomas Müller2016-02-026-3/+249
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [Share 2.0] Allow moving of sharesRoeland Jago Douma2016-02-026-3/+249
* | | | | | 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