Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14145 from owncloud/no-whitespace-from-themes-master | Lukas Reschke | 2015-02-12 | 2 | -11/+13 |
|\ | |||||
| * | catch any whitespaces which might get written to the output buffer while load... | Thomas Müller | 2015-02-12 | 2 | -11/+13 |
* | | Remove internal annotation | Lukas Reschke | 2015-02-12 | 1 | -5/+3 |
* | | Merge pull request #14071 from owncloud/add_timeout_for_post_requests | Björn Schießle | 2015-02-12 | 1 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | add timeout to curl request | Bjoern Schiessle | 2015-02-12 | 1 | -1/+2 |
* | | Merge pull request #10993 from owncloud/scanner-reuse-fileid | Morris Jobke | 2015-02-12 | 2 | -73/+124 |
|\ \ | |||||
| * | | only read permissions once | Robin Appelman | 2015-02-11 | 1 | -2/+3 |
| * | | Only try to scan the children of directories | Robin Appelman | 2015-02-11 | 1 | -3/+3 |
| * | | Cast mtimes and size to int | Robin Appelman | 2015-02-11 | 1 | -0/+3 |
| * | | Reuse cache data of existing files during scan | Robin Appelman | 2015-02-11 | 1 | -69/+116 |
* | | | Merge pull request #14129 from owncloud/deprecate-oc-json | Morris Jobke | 2015-02-12 | 2 | -122/+139 |
|\ \ \ | |||||
| * | | | Deprecate `OC_JSON` and `OCP\JSON` | Lukas Reschke | 2015-02-12 | 2 | -122/+139 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-12 | 2 | -10/+10 |
|/ / / | |||||
* | | | Merge pull request #14097 from yanntech/fix/utf8-check | Thomas Müller | 2015-02-11 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | in some case charset can be in lower case. | Yann VERRY | 2015-02-11 | 1 | -1/+3 |
| |/ / | |||||
* | | | Merge pull request #13979 from owncloud/group-share-collition-wrong-type-in-p... | Vincent Petry | 2015-02-11 | 1 | -5/+5 |
|\ \ \ | |/ / |/| | | |||||
| * | | Do not overwrite the shareType so the post hook is still correct | Joas Schilling | 2015-02-09 | 1 | -5/+5 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-11 | 2 | -0/+2 |
* | | | Merge pull request #13861 from owncloud/remove-disabled-files-repair-step | Thomas Müller | 2015-02-10 | 2 | -52/+0 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Revert "enabled disabled files app in repair step" | Morris Jobke | 2015-02-03 | 2 | -52/+0 |
* | | | Merge pull request #11056 from AdamWill/9885-opcode | Morris Jobke | 2015-02-10 | 2 | -2/+31 |
|\ \ \ | |||||
| * | | | writeData(): correct variable name for config file path | Adam Williamson | 2014-11-06 | 1 | -1/+1 |
| * | | | deleteFromOpcodeCache: make parameter mandatory, document parameter | Adam Williamson | 2014-11-06 | 1 | -1/+2 |
| * | | | add function to invalidate one opcache file, use it if possible #9885 | Adam Williamson | 2014-11-06 | 2 | -2/+30 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-10 | 6 | -72/+72 |
* | | | | Merge pull request #13425 from owncloud/phpdoc_cleanup | Morris Jobke | 2015-02-10 | 13 | -39/+39 |
|\ \ \ \ | |||||
| * | | | | Cleanup of PHPDoc return types | Robin McCorkell | 2015-01-16 | 13 | -39/+39 |
* | | | | | Merge pull request #13842 from owncloud/is_file_2_is_readable | Morris Jobke | 2015-02-09 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | readd is_file | Jörn Friedrich Dreyer | 2015-02-03 | 2 | -2/+2 |
| * | | | | | :camel:case | Arthur Schiwon | 2015-02-02 | 1 | -1/+1 |
| * | | | | | check if cache files are readable | Jörn Friedrich Dreyer | 2015-02-02 | 2 | -2/+2 |
* | | | | | | Merge pull request #13511 from owncloud/naturalsort_speeeeeed | Lukas Reschke | 2015-02-09 | 2 | -11/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Store FileInfo::getType() result for future use | Robin McCorkell | 2015-02-09 | 1 | -4/+3 |
| * | | | | | | Performance improvements for NaturalSort | Robin McCorkell | 2015-02-09 | 1 | -7/+10 |
* | | | | | | | Merge pull request #13928 from owncloud/prevent_ghost_files_master | Vincent Petry | 2015-02-09 | 1 | -2/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | for password protected link shares the password is stored in shareWith, so we... | Bjoern Schiessle | 2015-02-05 | 1 | -2/+9 |
* | | | | | | | | Merge pull request #13921 from owncloud/ocs-af | Vincent Petry | 2015-02-09 | 4 | -6/+208 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix license email | Bernhard Posselt | 2015-02-05 | 2 | -6/+6 |
| * | | | | | | | | add a controller and reponse for ocs | Bernhard Posselt | 2015-02-05 | 3 | -1/+203 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #13852 from owncloud/cache-app-versions | Vincent Petry | 2015-02-09 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clear app version cache on upgrade | Robin Appelman | 2015-02-03 | 1 | -0/+1 |
| * | | | | | | | | Cache app versions | Robin Appelman | 2015-02-03 | 1 | -2/+6 |
* | | | | | | | | | Merge pull request #13870 from owncloud/drop-oc-preferences-2 | Vincent Petry | 2015-02-09 | 1 | -181/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | drop OC\Preferences | Morris Jobke | 2015-02-04 | 1 | -181/+0 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #13869 from owncloud/drop-oc-preferences | Vincent Petry | 2015-02-09 | 2 | -122/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | drop OC_Preferences | Morris Jobke | 2015-02-04 | 2 | -122/+0 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #13973 from owncloud/enhancement/security/13366 | Lukas Reschke | 2015-02-09 | 6 | -29/+53 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId` | Lukas Reschke | 2015-02-09 | 6 | -29/+53 |
* | | | | | | | | | Merge pull request #13854 from owncloud/avatar-exists | Vincent Petry | 2015-02-09 | 3 | -6/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add a better way to check if an avatar exists for the user | Robin Appelman | 2015-02-03 | 3 | -6/+17 |