summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Remove internal annotationLukas Reschke2015-02-121-5/+3
* | 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 #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-122-10/+10
|/ / /
* | | 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-111-5/+5
|\ \ \ | |/ / |/| |
| * | Do not overwrite the shareType so the post hook is still correctJoas Schilling2015-02-091-5/+5
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-112-0/+2
* | | 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 #11056 from AdamWill/9885-opcodeMorris Jobke2015-02-102-2/+31
|\ \ \
| * | | writeData(): correct variable name for config file pathAdam Williamson2014-11-061-1/+1
| * | | deleteFromOpcodeCache: make parameter mandatory, document parameterAdam Williamson2014-11-061-1/+2
| * | | add function to invalidate one opcache file, use it if possible #9885Adam Williamson2014-11-062-2/+30
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-106-72/+72
* | | | Merge pull request #13425 from owncloud/phpdoc_cleanupMorris Jobke2015-02-1013-39/+39
|\ \ \ \
| * | | | Cleanup of PHPDoc return typesRobin McCorkell2015-01-1613-39/+39
* | | | | Merge pull request #13842 from owncloud/is_file_2_is_readableMorris Jobke2015-02-092-2/+2
|\ \ \ \ \
| * | | | | readd is_fileJörn Friedrich Dreyer2015-02-032-2/+2
| * | | | | :camel:caseArthur Schiwon2015-02-021-1/+1
| * | | | | check if cache files are readableJörn Friedrich Dreyer2015-02-022-2/+2
* | | | | | Merge pull request #13511 from owncloud/naturalsort_speeeeeedLukas Reschke2015-02-092-11/+13
|\ \ \ \ \ \
| * | | | | | Store FileInfo::getType() result for future useRobin McCorkell2015-02-091-4/+3
| * | | | | | Performance improvements for NaturalSortRobin McCorkell2015-02-091-7/+10
* | | | | | | Merge pull request #13928 from owncloud/prevent_ghost_files_masterVincent Petry2015-02-091-2/+9
|\ \ \ \ \ \ \
| * | | | | | | for password protected link shares the password is stored in shareWith, so we...Bjoern Schiessle2015-02-051-2/+9
* | | | | | | | Merge pull request #13921 from owncloud/ocs-afVincent Petry2015-02-094-6/+208
|\ \ \ \ \ \ \ \
| * | | | | | | | fix license emailBernhard Posselt2015-02-052-6/+6
| * | | | | | | | add a controller and reponse for ocsBernhard Posselt2015-02-053-1/+203
| |/ / / / / / /
* | | | | | | | Merge pull request #13852 from owncloud/cache-app-versionsVincent Petry2015-02-091-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | clear app version cache on upgradeRobin Appelman2015-02-031-0/+1
| * | | | | | | | Cache app versionsRobin Appelman2015-02-031-2/+6
* | | | | | | | | Merge pull request #13870 from owncloud/drop-oc-preferences-2Vincent Petry2015-02-091-181/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | drop OC\PreferencesMorris Jobke2015-02-041-181/+0
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #13869 from owncloud/drop-oc-preferencesVincent Petry2015-02-092-122/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | drop OC_PreferencesMorris Jobke2015-02-042-122/+0
| |/ / / / / / / /
* | | | | | | | | Merge pull request #13973 from owncloud/enhancement/security/13366Lukas Reschke2015-02-096-29/+53
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId`Lukas Reschke2015-02-096-29/+53
* | | | | | | | | Merge pull request #13854 from owncloud/avatar-existsVincent Petry2015-02-093-6/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a better way to check if an avatar exists for the userRobin Appelman2015-02-033-6/+17