Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14197 from ↵ | Lukas Reschke | 2015-02-13 | 1 | -0/+9 |
|\ | | | | | | | | | owncloud/ensure-that-passed-file-path-is-always-a-string Ensure that passed argument is always a string | ||||
| * | Ensure that passed argument is always a string | Lukas Reschke | 2015-02-13 | 1 | -0/+9 |
| | | | | | | | | | | | | Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour. Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well. | ||||
* | | Merge pull request #14086 from hlop/master | Lukas Reschke | 2015-02-13 | 1 | -1/+1 |
|\ \ | |/ |/| | App install behind a Proxy | ||||
| * | App install behind a Proxy | Witali Rott | 2015-02-11 | 1 | -1/+1 |
| | | |||||
* | | 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... | ||||
| * | | catch any whitespaces which might get written to the output buffer while ↵ | Thomas Müller | 2015-02-12 | 2 | -11/+13 |
| | | | | | | | | | | | | loading a theme | ||||
* | | | Remove internal annotation | Lukas Reschke | 2015-02-12 | 1 | -5/+3 |
| | | | | | | | | | | | | PHPStorm complained about those functions being declared as Internal. I doubt that this is actually the case since they are even in the public API. | ||||
* | | | 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 | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | Reuse known fileids and cache data in the scanner | ||||
| * | | | 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` | ||||
| * | | | | Deprecate `OC_JSON` and `OCP\JSON` | Lukas Reschke | 2015-02-12 | 2 | -122/+139 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This deprecates – but not removes – those two classes and all functions in it. There is no reason that new developments should use those methods as with the AppFramework there is a replacement that allows testable code. With the `@deprecated` annotation IDEs like PHPStorm will point out to the developer that a functionality is deprecated and that there is a better suited replacement. | ||||
* | | | | | [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. | ||||
| * | | | | in some case charset can be in lower case. | Yann VERRY | 2015-02-11 | 1 | -1/+3 |
| |/ / / | | | | | | | | | | | | | Add strtoupper() in UTF-8 check to avoid error message | ||||
* | | | | Merge pull request #13979 from ↵ | Vincent Petry | 2015-02-11 | 1 | -5/+5 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | owncloud/group-share-collition-wrong-type-in-post-hook Do not overwrite the shareType so the post hook is still correct | ||||
| * | | | 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" | ||||
| * | | Revert "enabled disabled files app in repair step" | Morris Jobke | 2015-02-03 | 2 | -52/+0 |
| | | | | | | | | | | | | This reverts commit d70160c6077ca017d6cb7d61f066fe33e3b1e081. | ||||
* | | | Merge pull request #11056 from AdamWill/9885-opcode | Morris Jobke | 2015-02-10 | 2 | -2/+31 |
|\ \ \ | | | | | | | | | add function to invalidate one opcache file, use it if possible #9885 | ||||
| * | | | writeData(): correct variable name for config file path | Adam Williamson | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | It changed since we wrote this patch. | ||||
| * | | | deleteFromOpcodeCache: make parameter mandatory, document parameter | Adam Williamson | 2014-11-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Both pointed out in submission review by @bantu, thanks. | ||||
| * | | | add function to invalidate one opcache file, use it if possible #9885 | Adam Williamson | 2014-11-06 | 2 | -2/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #9885 appears to be triggered by ownCloud invalidating the entire PHP opcache. Testing indicates it can be avoided by only invalidating the single file that was written from the opcache, instead of clearing the whole thing. In general it is more efficient to invalidate only the single file that was changed, rather than the whole cache. This adds a deleteFromOpcodeCache() function which invalidates a single file from the opcache if possible, returning true if the underlying function returns true (which may mean 'success', or 'file does not exist', or 'file exists but is not in opcache', all of which are OK to treat as good for our purposes). It also changes writeData() in config.php to try using deleteFromOpcodeCache() and only fall back on clearOpcodeCache() if that fails. | ||||
* | | | | [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 | ||||
| * | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | check if cache files are readable | ||||
| * | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | NaturalSort performance improvements | ||||
| * | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A combination of using isset() instead of count() or strlen(), caching the chunkify function, and replacing is_numeric() with some comparisons | ||||
* | | | | | | | Merge pull request #13928 from owncloud/prevent_ghost_files_master | Vincent Petry | 2015-02-09 | 1 | -2/+9 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | prevent creation of ghost directories | ||||
| * | | | | | | | for password protected link shares the password is stored in shareWith, so ↵ | Bjoern Schiessle | 2015-02-05 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to set this manually to null for the hooks | ||||
* | | | | | | | | Merge pull request #13921 from owncloud/ocs-af | Vincent Petry | 2015-02-09 | 4 | -6/+208 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add a controller and reponse for ocs | ||||
| * | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Cache app versions | ||||
| * | | | | | | | | 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 | ||||
| * | | | | | | | | | 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 | ||||
| * | | | | | | | | | drop OC_Preferences | Morris Jobke | 2015-02-04 | 2 | -122/+0 |
| |/ / / / / / / / |