Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14427 from owncloud/fix-some-php-docs | Bernhard Posselt | 2015-02-23 | 1 | -3/+4 |
|\ | |||||
| * | Fix some PHPDocs | Lukas Reschke | 2015-02-23 | 1 | -3/+4 |
* | | Merge pull request #14403 from owncloud/update-license-headers | Thomas Müller | 2015-02-23 | 449 | -4412/+8309 |
|\ \ | |/ |/| | |||||
| * | Updating license headers | Jenkins for ownCloud | 2015-02-23 | 449 | -4412/+8309 |
* | | Merge pull request #14422 from owncloud/use-off-and-off | Thomas Müller | 2015-02-23 | 1 | -1/+4 |
|\ \ | |||||
| * | | Use "off" and "off" instead of true booleans | Lukas Reschke | 2015-02-23 | 1 | -1/+4 |
| |/ | |||||
* | | Merge pull request #14275 from chris-se/master | Lukas Reschke | 2015-02-23 | 1 | -3/+6 |
|\ \ | |/ |/| | |||||
| * | DAV authentication: also use Owncloud's internal user for short-circuit | Christian Seiler | 2015-02-16 | 1 | -1/+1 |
| * | DAV authentication: use Owncloud's internal user instead of HTTP-supplied one | Christian Seiler | 2015-02-16 | 1 | -2/+5 |
* | | Merge pull request #14414 from owncloud/add-ini-helper | Thomas Müller | 2015-02-22 | 1 | -1/+27 |
|\ \ | |||||
| * | | Add helper to check for `ini` values in `OC_Util::checkServer` | Lukas Reschke | 2015-02-21 | 1 | -1/+27 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-22 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #13777 from owncloud/close-cursor | Lukas Reschke | 2015-02-20 | 2 | -21/+29 |
|\ \ | |||||
| * | | ignore cursorclosing | Bernhard Posselt | 2015-01-29 | 2 | -21/+29 |
* | | | Merge pull request #13767 from owncloud/issue/13764-mimetype-racecondition | Thomas Müller | 2015-02-20 | 1 | -3/+7 |
|\ \ \ | |||||
| * | | | Use insertIfNotExists() and reload mimetypes after inserting one | Joas Schilling | 2015-02-02 | 1 | -3/+7 |
* | | | | Merge pull request #14359 from owncloud/add-satisfy-all | Lukas Reschke | 2015-02-20 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Add `Satisfy All` | Lukas Reschke | 2015-02-19 | 1 | -0/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-20 | 2 | -4/+6 |
* | | | | | Merge pull request #14366 from owncloud/remove-old-l10n-files | Lukas Reschke | 2015-02-19 | 1 | -8/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove some old l10n files they arent loaded anymore | Joas Schilling | 2015-02-19 | 1 | -8/+0 |
* | | | | | | Merge pull request #14199 from owncloud/cast-type-manually | Morris Jobke | 2015-02-19 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Manually type-case all AJAX files | Lukas Reschke | 2015-02-13 | 1 | -3/+3 |
* | | | | | | | Port of #14041 to master | Arthur Schiwon | 2015-02-19 | 1 | -3/+37 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-view | Thomas Müller | 2015-02-19 | 1 | -6/+132 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add some basic PHPDoc to functions | Lukas Reschke | 2015-02-18 | 1 | -6/+124 |
| * | | | | | | Prevent directory traversals in ctr of \OC\Files\View | Lukas Reschke | 2015-02-18 | 1 | -0/+8 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-19 | 2 | -12/+12 |
* | | | | | | Merge pull request #13836 from owncloud/part-no-cache-update | Thomas Müller | 2015-02-19 | 2 | -1/+13 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Dont bother updating the cache when working with part files | Robin Appelman | 2015-02-05 | 1 | -0/+12 |
| * | | | | | Dont update the cache after fopen | Robin Appelman | 2015-02-05 | 1 | -1/+1 |
* | | | | | | Merge pull request #13989 from owncloud/enhancment/security/11857 | Clark Tomlinson | 2015-02-18 | 3 | -7/+279 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rename to allowEval | Lukas Reschke | 2015-02-16 | 1 | -1/+1 |
| * | | | | | | Allow AppFramework applications to specify a custom CSP header | Lukas Reschke | 2015-02-16 | 3 | -7/+279 |
* | | | | | | | Merge pull request #14335 from owncloud/enable-strict-mode-per-deafult | Clark Tomlinson | 2015-02-18 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix invalid `ini_set` directives | Lukas Reschke | 2015-02-18 | 1 | -2/+2 |
* | | | | | | | | Merge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcac... | Lukas Reschke | 2015-02-18 | 3 | -21/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert "add debug log for memcache instantiation" | Lukas Reschke | 2015-02-18 | 3 | -21/+7 |
| |/ / / / / / / | |||||
* | | | | | | | | Use the untrusted domain in the installer | Lukas Reschke | 2015-02-18 | 1 | -2/+2 |
* | | | | | | | | Check if instance is not yet installed | Lukas Reschke | 2015-02-18 | 1 | -0/+1 |
|/ / / / / / / | |||||
* | | | | | | | 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 |
* | | | | | | | | Merge pull request #14056 from owncloud/refactor/13976 | Lukas Reschke | 2015-02-17 | 19 | -432/+576 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Incorporate review changes | Lukas Reschke | 2015-02-16 | 3 | -9/+20 |
| * | | | | | | | | Add blackmagic due to cyclic dependency :see_no_evil: | Lukas Reschke | 2015-02-16 | 2 | -4/+11 |