summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-0532-28/+178
* Merge pull request #20315 from owncloud/add-coverityThomas Müller2015-11-041-0/+1
|\
| * Add coverity badgeLukas Reschke2015-11-041-0/+1
* | Merge pull request #20053 from owncloud/getfileinfo-lockingThomas Müller2015-11-043-65/+88
|\ \ | |/ |/|
| * mark path as checkedRobin Appelman2015-11-041-0/+1
| * when a file is locked use old cache dataRobin Appelman2015-11-041-29/+37
| * fix whitespaceRobin Appelman2015-11-041-2/+2
| * only lock in getDirectoryContent if we need to update the cacheRobin Appelman2015-11-031-21/+17
| * only lock in getFileInfo if we need to update the cacheRobin Appelman2015-11-031-18/+16
| * Split checkUpdateRobin Appelman2015-11-032-45/+65
* | Merge pull request #20300 from owncloud/fix_commentMorris Jobke2015-11-041-1/+1
|\ \
| * | adjust comment, this parameter was added for 9.0Björn Schießle2015-11-041-1/+1
|/ /
* | Merge pull request #18361 from owncloud/sharing_performance_improvementsThomas Müller2015-11-043-9/+32
|\ \
| * | cache result from parent foldersBjoern Schiessle2015-11-043-9/+32
* | | Merge pull request #20155 from owncloud/fix-20020Morris Jobke2015-11-041-3/+7
|\ \ \
| * | | add port to host only, if an URL is used instead of a plain hostnameArthur Schiwon2015-11-041-3/+7
|/ / /
* | | Merge pull request #20283 from owncloud/fix-varaible-typeThomas Müller2015-11-041-4/+4
|\ \ \
| * | | Fix typo in variable nameMorris Jobke2015-11-041-4/+4
| |/ /
* | | Merge pull request #18821 from owncloud/global-classesThomas Müller2015-11-043-20/+51
|\ \ \
| * | | Global Classes for Core.Raghu Nayyar2015-11-023-20/+51
* | | | Merge pull request #20157 from owncloud/users-fixeveryonecountThomas Müller2015-11-045-60/+110
|\ \ \ \
| * | | | fix subadmin user count for empty groupsMorris Jobke2015-11-041-0/+1
| * | | | Fix everyone count for subadminsVincent Petry2015-10-295-60/+109
* | | | | Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorageThomas Müller2015-11-041-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Correct the description of function setEncryptHomeStoragePhil Davis2015-11-031-1/+1
| | |_|/ | |/| |
* / | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0452-40/+202
|/ / /
* | | Merge pull request #20269 from owncloud/capabilities-webdav-ng-syncThomas Müller2015-11-031-1/+2
|\ \ \
| * | | Add a new core capability which tells the clients which url to useThomas Müller2015-11-031-1/+2
* | | | Merge pull request #20223 from owncloud/fix-apply-webdav-tagsThomas Müller2015-11-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix TagList namespace in property mapVincent Petry2015-11-021-1/+1
* | | | Merge pull request #20201 from owncloud/checkboxes-groups-enableThomas Müller2015-11-032-18/+10
|\ \ \ \
| * \ \ \ Merge branch 'master' into checkboxes-groups-enableRaghu Nayyar2015-11-0230-10/+90
| |\ \ \ \
| * | | | | new checkbox style in app settingsHendrik Leppelsack2015-10-312-18/+10
* | | | | | Merge pull request #20253 from owncloud/external-storage-wordingThomas Müller2015-11-031-1/+1
|\ \ \ \ \ \
| * | | | | | fix external storage wording detail, ref #19858Jan-Christoph Borchardt2015-11-031-1/+1
* | | | | | | Merge pull request #20256 from owncloud/fix-searchbox-iceweaselMorris Jobke2015-11-031-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | don't validate searchboxHendrik Leppelsack2015-11-031-1/+1
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0312-6/+40
* | | | | | Merge pull request #20232 from owncloud/error-button-colorThomas Müller2015-11-021-0/+3
|\ \ \ \ \ \
| * | | | | | fix button text colorJan-Christoph Borchardt2015-11-021-0/+3
| |/ / / / /
* | | | | | Merge pull request #20045 from owncloud/dbal-2.5.2Thomas Müller2015-11-021-0/+0
|\ \ \ \ \ \
| * | | | | | Bump 3rdparty for dbal-2.5.2Roeland Jago Douma2015-11-021-0/+0
|/ / / / / /
* | | | | | Merge pull request #20196 from owncloud/use-actual-mimetype-detection-instead...Thomas Müller2015-11-021-9/+9
|\ \ \ \ \ \
| * | | | | | Use actual mimetype detection instead of extensionLukas Reschke2015-10-311-9/+9
* | | | | | | Merge pull request #20191 from owncloud/fix-20151Thomas Müller2015-11-025-3/+167
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'master' into fix-20151blizzz2015-11-0262-28/+248
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | add method to count users by loginname and use it for diagnose test, fixes #2...Arthur Schiwon2015-10-305-3/+167
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #20220 from owncloud/keep-search-openThomas Müller2015-11-022-2/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | keep searchbox open if it is in actionHendrik Leppelsack2015-11-022-2/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #20192 from owncloud/fix-20090Thomas Müller2015-11-022-0/+12
|\ \ \ \ \