summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use newly generated certificate authorityLukas Reschke2016-02-034-155/+57
* Merge pull request #22086 from RealRancor/RealRancor-patch-1Thomas Müller2016-02-031-1/+0
|\
| * Remove files_locking from shipped.jsonRealRancor2016-02-031-1/+0
* | Merge pull request #22095 from owncloud/public_link_with_portThomas Müller2016-02-033-12/+23
|\ \
| * | Construct valid URLRoeland Jago Douma2016-02-032-10/+4
| * | host and hostname are different thingsRoeland Jago Douma2016-02-031-2/+19
| |/
* | Merge pull request #22071 from owncloud/cache-split-insertThomas Müller2016-02-034-44/+90
|\ \
| * | split cache->insert from cache->putRobin Appelman2016-02-034-44/+90
* | | Merge pull request #22098 from owncloud/cleanup-core-appsThomas Müller2016-02-036-12/+4
|\ \ \
| * | | Make sure tests don't leave a stray directory behindJoas Schilling2016-02-031-3/+3
| * | | Make sure encryption has a valid licence tagJoas Schilling2016-02-031-1/+1
| * | | Remove deprecated and unused standalone tagJoas Schilling2016-02-032-2/+0
| * | | Remove invalid app user doc linksJoas Schilling2016-02-032-6/+0
* | | | Merge pull request #21996 from owncloud/flysystem-1.0.16Thomas Müller2016-02-031-0/+0
|\ \ \ \
| * | | | [3rdparty] Bump flysystem to 1.0.16Roeland Jago Douma2016-02-011-0/+0
* | | | | Merge pull request #22070 from owncloud/share2_exceptionsThomas Müller2016-02-0310-53/+70
|\ \ \ \ \
| * | | | | [Share 2.0] Use GenericShareExceptionRoeland Jago Douma2016-02-024-41/+22
| * | | | | [Share 2.0] Add exceptions to OCPRoeland Jago Douma2016-02-0210-15/+51
* | | | | | Merge pull request #22099 from owncloud/revert-22090-skip-migration-tests-set...Thomas Müller2016-02-033-21/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Revert "setting to skip migration tests by default"Morris Jobke2016-02-033-21/+0
|/ / / / /
* | | | | 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
| | |_|_|_|_|_|/ | |/| | | | | |