Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add `Satisfy All` | Lukas Reschke | 2015-02-19 | 1 | -0/+1 |
* | Merge pull request #13989 from owncloud/enhancment/security/11857 | Clark Tomlinson | 2015-02-18 | 1 | -6/+9 |
|\ | |||||
| * | Allow AppFramework applications to specify a custom CSP header | Lukas Reschke | 2015-02-16 | 1 | -6/+9 |
* | | Merge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcac... | Lukas Reschke | 2015-02-18 | 2 | -19/+6 |
|\ \ | |||||
| * | | Revert "add debug log for memcache instantiation" | Lukas Reschke | 2015-02-18 | 2 | -19/+6 |
* | | | Use the untrusted domain in the installer | Lukas Reschke | 2015-02-18 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #14308 from owncloud/fix-14247 | Thomas Müller | 2015-02-18 | 1 | -0/+1 |
|\ \ | |||||
| * | | Add mapping for a broken varchar type. Fixes #14247 | Victor Dubiniuk | 2015-02-17 | 1 | -0/+1 |
* | | | Merge pull request #14273 from owncloud/require-at-least-apcu-4-0-6 | Lukas Reschke | 2015-02-18 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Use APCu only if available in version 4.0.6 and higher | Lukas Reschke | 2015-02-17 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #14207 from owncloud/propfind-optimize | Morris Jobke | 2015-02-18 | 1 | -18/+27 |
|\ \ \ | |/ / |/| | | |||||
| * | | pass fileinfo to getStorageInfo | Robin Appelman | 2015-02-13 | 1 | -2/+1 |
| * | | Cache quota info for directories | Robin Appelman | 2015-02-13 | 1 | -16/+26 |
| |/ | |||||
* | | Incorporate review changes | Lukas Reschke | 2015-02-16 | 2 | -7/+19 |
* | | Add blackmagic due to cyclic dependency :see_no_evil: | Lukas Reschke | 2015-02-16 | 1 | -3/+3 |
* | | Make scrutinizer happy | Lukas Reschke | 2015-02-16 | 2 | -2/+2 |
* | | Refactor OC_Request into TrustedDomainHelper and IRequest | Lukas Reschke | 2015-02-16 | 16 | -413/+456 |
* | | add debug log for memcache instantiation | Jörn Friedrich Dreyer | 2015-02-16 | 2 | -6/+19 |
* | | Merge pull request #14128 from owncloud/drop-unused-methods | Morris Jobke | 2015-02-16 | 1 | -27/+10 |
|\ \ | |||||
| * | | Remove unused function and correct PHPDoc | Lukas Reschke | 2015-02-16 | 1 | -27/+10 |
* | | | Merge pull request #13750 from owncloud/enhanced-code-checker | Thomas Müller | 2015-02-16 | 3 | -51/+250 |
|\ \ \ | |||||
| * | | | integrate code checker in the installer | Thomas Müller | 2015-02-11 | 3 | -54/+27 |
| * | | | implement php code checker to detect usage of not allowed private APIs - incl... | Thomas Müller | 2015-02-10 | 3 | -1/+227 |
* | | | | Merge pull request #13269 from owncloud/issue/13211-cache-array-implementation | Joas Schilling | 2015-02-16 | 2 | -1/+72 |
|\ \ \ \ | |||||
| * | | | | Add an array implementation of cache and use it if we are not debugging | Joas Schilling | 2015-02-16 | 2 | -1/+72 |
* | | | | | Merge pull request #14194 from owncloud/url-encode-logout-attribute | Thomas Müller | 2015-02-16 | 2 | -3/+2 |
|\ \ \ \ \ | |||||
| * | | | | | URLEncode logout attribute | Lukas Reschke | 2015-02-13 | 2 | -3/+2 |
* | | | | | | Merge pull request #13890 from owncloud/add-no-referrer | Lukas Reschke | 2015-02-16 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Add noreferrer to footer URI | Lukas Reschke | 2015-02-16 | 1 | -1/+2 |
* | | | | | | Merge pull request #14201 from owncloud/propagator-dont-decrease-mtime | Thomas Müller | 2015-02-16 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Dont lower the mtime of a folder when propagating changes | Robin Appelman | 2015-02-13 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #14138 from owncloud/fix-image-flip-php53 | Thomas Müller | 2015-02-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Check if imageflip is available | Morris Jobke | 2015-02-12 | 1 | -1/+1 |
* | | | | | | Merge pull request #14197 from owncloud/ensure-that-passed-file-path-is-alway... | Lukas Reschke | 2015-02-13 | 1 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Ensure that passed argument is always a string | Lukas Reschke | 2015-02-13 | 1 | -0/+9 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #14086 from hlop/master | Lukas Reschke | 2015-02-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | 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 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 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Deprecate `OC_JSON` and `OCP\JSON` | Lukas Reschke | 2015-02-12 | 1 | -16/+30 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | 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 |
| |/ / / / / |