summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* This is an arrayLukas Reschke2015-02-131-1/+1
* Manually type-case all AJAX filesLukas Reschke2015-02-1347-133/+133
* Merge pull request #14171 from owncloud/fix/11639Joas Schilling2015-02-132-1/+17
|\
| * Incorporate review changesLukas Reschke2015-02-122-3/+1
| * Improve: Index for file_mapwindaishi2015-02-121-0/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1398-148/+22
|/
* Merge pull request #13771 from owncloud/fix-humanfileSizeLukas Reschke2015-02-122-1/+3
|\
| * generate valid human readable text for 0 - fixed #9342Thomas Müller2015-01-292-1/+3
* | Merge pull request #13780 from owncloud/cmreflector-inheritanceLukas Reschke2015-02-121-2/+58
|\ \
| * | another test for overriding the docblockBernhard Posselt2015-01-291-0/+14
| * | additional inheritance testsBernhard Posselt2015-01-291-2/+44
* | | Merge pull request #14145 from owncloud/no-whitespace-from-themes-masterLukas Reschke2015-02-122-11/+13
|\ \ \
| * | | catch any whitespaces which might get written to the output buffer while load...Thomas Müller2015-02-122-11/+13
* | | | Merge pull request #14159 from owncloud/remove-internalThomas Müller2015-02-121-5/+3
|\ \ \ \
| * | | | Remove internal annotationLukas Reschke2015-02-121-5/+3
|/ / / /
* | | | Merge pull request #14121 from Zillode/app-faviconMorris Jobke2015-02-122-4/+4
|\ \ \ \
| * | | | Disable application-specific favicons for non-user pagesLode Hoste2015-02-112-4/+4
* | | | | Merge pull request #9038 from owncloud/add_tag_fileLukas Reschke2015-02-121-0/+1
|\ \ \ \ \
| * | | | | Add .tag file to make tar balls tracableDaniel Molkentin2014-06-141-0/+1
* | | | | | Merge pull request #14071 from owncloud/add_timeout_for_post_requestsBjörn Schießle2015-02-121-1/+2
|\ \ \ \ \ \
| * | | | | | add timeout to curl requestBjoern Schiessle2015-02-121-1/+2
* | | | | | | Merge pull request #13913 from rullzer/showusergroupsLukas Reschke2015-02-122-0/+14
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Added overview of groups a user is a member ofRoeland Jago Douma2015-02-122-0/+14
* | | | | | | Merge pull request #14135 from cmeh/masterMorris Jobke2015-02-122-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Orthography: "Back-end" -> Backend (without hyphen) and correction of "users"...cmeh2015-02-121-1/+1
| * | | | | | | Adding a missing space between value and unitcmeh2015-02-121-1/+1
* | | | | | | | Merge pull request #10993 from owncloud/scanner-reuse-fileidMorris Jobke2015-02-122-73/+124
|\ \ \ \ \ \ \ \
| * | | | | | | | only read permissions onceRobin Appelman2015-02-111-2/+3
| * | | | | | | | Only try to scan the children of directoriesRobin Appelman2015-02-111-3/+3
| * | | | | | | | Cast mtimes and size to intRobin Appelman2015-02-111-0/+3
| * | | | | | | | Reuse cache data of existing files during scanRobin Appelman2015-02-111-69/+116
* | | | | | | | | Merge pull request #14129 from owncloud/deprecate-oc-jsonMorris Jobke2015-02-122-122/+139
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Deprecate `OC_JSON` and `OCP\JSON`Lukas Reschke2015-02-122-122/+139
| | |_|/ / / / / / | |/| | | | | | |
* / | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1266-70/+176
|/ / / / / / / /
* | | | | | | | Merge pull request #14126 from owncloud/remove-that-old-thingLukas Reschke2015-02-111-54/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Remove unused fileLukas Reschke2015-02-111-54/+0
|/ / / / / / /
* | | | | | | Merge pull request #14097 from yanntech/fix/utf8-checkThomas Müller2015-02-111-1/+3
|\ \ \ \ \ \ \
| * | | | | | | in some case charset can be in lower case.Yann VERRY2015-02-111-1/+3
| |/ / / / / /
* | | | | | | Merge pull request #13979 from owncloud/group-share-collition-wrong-type-in-p...Vincent Petry2015-02-112-5/+16
|\ \ \ \ \ \ \
| * | | | | | | Add a test for the post_shared hook shareTypeJoas Schilling2015-02-091-0/+11
| * | | | | | | Do not overwrite the shareType so the post hook is still correctJoas Schilling2015-02-091-5/+5
* | | | | | | | Merge pull request #14105 from owncloud/second-parameter-is-optionalThomas Müller2015-02-111-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Second parameter is optionalLukas Reschke2015-02-111-1/+1
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1161-37/+83
* | | | | | | Merge pull request #14074 from RealRancor/documents_preview_notesMorris Jobke2015-02-111-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Add hint for troubleshooting MS Word previewsRealRancor2015-02-101-0/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #13861 from owncloud/remove-disabled-files-repair-stepThomas Müller2015-02-102-52/+0
|\ \ \ \ \ \ \
| * | | | | | | Revert "enabled disabled files app in repair step"Morris Jobke2015-02-032-52/+0
* | | | | | | | Merge pull request #14072 from owncloud/add-files-external-test-readmeLukas Reschke2015-02-101-0/+58
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | add rreadme for files external testsMorris Jobke2015-02-101-0/+58
|/ / / / / / /