Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14416 from owncloud/setup-command | Thomas Müller | 2015-02-23 | 5 | -25/+34 |
|\ | | | | | Setup command | ||||
| * | properly initialize OC::$WEBROOT and host name | Thomas Müller | 2015-02-23 | 1 | -1/+1 |
| | | |||||
| * | Fix namespace of OC_Setup -> \OC\Setup | Thomas Müller | 2015-02-23 | 4 | -24/+33 |
| | | |||||
* | | Merge pull request #14119 from owncloud/dbal251 | Thomas Müller | 2015-02-23 | 1 | -0/+3 |
|\ \ | |/ |/| | Update doctrine/dbal to 2.5.1 #13537 | ||||
| * | Skip primary index if the table has one | Victor Dubiniuk | 2015-02-16 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #13829 from owncloud/appmanager-list | Vincent Petry | 2015-02-23 | 5 | -111/+166 |
|\ \ | | | | | | | Better caching for enabled apps | ||||
| * | | allow overwriting the appmanager in oc_util by subclassing | Robin Appelman | 2015-02-18 | 1 | -1/+5 |
| | | | |||||
| * | | Use appmanager in OC_App::enable/disable | Robin Appelman | 2015-02-17 | 1 | -3/+5 |
| | | | |||||
| * | | better name for getAppsEnabledForUser | Robin Appelman | 2015-02-17 | 2 | -2/+2 |
| | | | |||||
| * | | also set user in UserSession when doing OC_User::setUserId | Robin Appelman | 2015-02-17 | 1 | -5/+36 |
| | | | |||||
| * | | better user group caching | Robin Appelman | 2015-02-17 | 1 | -10/+1 |
| | | | |||||
| * | | Update cache when enabling/disabling apps | Robin Appelman | 2015-02-17 | 1 | -1/+4 |
| | | | |||||
| * | | Use the app manager from oc_app | Robin Appelman | 2015-02-16 | 1 | -75/+67 |
| | | | |||||
| * | | Add getInstalledApps and getAppsForUser to the app manager | Robin Appelman | 2015-02-16 | 1 | -17/+49 |
| | | | |||||
* | | | Merge pull request #14427 from owncloud/fix-some-php-docs | Bernhard Posselt | 2015-02-23 | 1 | -3/+4 |
|\ \ \ | | | | | | | | | Fix some PHPDocs | ||||
| * | | | 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 | 315 | -2696/+6199 |
|\ \ \ \ | |/ / / |/| | | | Update license headers | ||||
| * | | | Updating license headers | Jenkins for ownCloud | 2015-02-23 | 315 | -2696/+6199 |
| | | | | |||||
* | | | | 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 | ||||
| * | | | | Use "off" and "off" instead of true booleans | Lukas Reschke | 2015-02-23 | 1 | -1/+4 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | Apparently a boolean in php.ini is according to the documentation "on" or "off"… Fixes itself. | ||||
* | | | | Merge pull request #14275 from chris-se/master | Lukas Reschke | 2015-02-23 | 1 | -3/+6 |
|\ \ \ \ | |/ / / |/| | | | DAV authentication: use Owncloud's internal user instead of HTTP auth one | ||||
| * | | | DAV authentication: also use Owncloud's internal user for short-circuit | Christian Seiler | 2015-02-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | It still works otherwise, but without this, the performance optimization of #13416 is defeated in these situations. | ||||
| * | | | DAV authentication: use Owncloud's internal user instead of HTTP-supplied one | Christian Seiler | 2015-02-16 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | Fixes: #14048, #14104, calendar#712 | ||||
* | | | | Add helper to check for `ini` values in `OC_Util::checkServer` | Lukas Reschke | 2015-02-21 | 1 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to check for specific values in the PHP.ini that ownCloud requires for full compatibility. `mbstring.func_overload`: https://github.com/owncloud/core/issues/14372 `output_buffering`: http://doc.owncloud.org/server/8.0/admin_manual/configuration/big_file_upload_configuration.html#configuring-php Fixes https://github.com/owncloud/core/issues/14372 and https://github.com/owncloud/core/issues/14412 | ||||
* | | | | Merge pull request #13777 from owncloud/close-cursor | Lukas Reschke | 2015-02-20 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | Close cursor for appframework and manipulation queries if applicable | ||||
| * | | | | ignore cursorclosing | Bernhard Posselt | 2015-01-29 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | 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 | ||||
| * | | | | | 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` | ||||
| * | | | | | | Add `Satisfy All` | Lukas Reschke | 2015-02-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/14356 | ||||
* | | | | | | | Port of #14041 to master | Arthur Schiwon | 2015-02-19 | 1 | -3/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on ownCloud upgrade: upgrade all apps in order, load important ones Fix "other" app update stack | ||||
* | | | | | | | Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-view | Thomas Müller | 2015-02-19 | 1 | -6/+132 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Disallow path traversals in file view | ||||
| * | | | | | | | 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 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | This prevents a misusage of \OC\Files\View by calling it with user-supplied input. In such cases an exception is now thrown. | ||||
* | | | | | | | Merge pull request #13836 from owncloud/part-no-cache-update | Thomas Müller | 2015-02-19 | 2 | -1/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Dont update the cache when working with part files | ||||
| * | | | | | | 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 | 1 | -6/+9 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Allow AppFramework applications to specify a custom CSP header | ||||
| * | | | | | | | Allow AppFramework applications to specify a custom CSP header | Lukas Reschke | 2015-02-16 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows AppFramework applications to specify a custom CSP header for example when the default policy is too strict. Furthermore this allows us to partially migrate away from CSS and allowed eval() in our JavaScript components. Legacy ownCloud components will still use the previous policy. Application developers can use this as following in their controllers: ```php $response = new TemplateResponse('activity', 'list', []); $cspHelper = new ContentSecurityPolicyHelper(); $cspHelper->addAllowedScriptDomain('www.owncloud.org'); $response->addHeader('Content-Security-Policy', $cspHelper->getPolicy()); return $response; ``` Fixes https://github.com/owncloud/core/issues/11857 which is a pre-requisite for https://github.com/owncloud/core/issues/13458 and https://github.com/owncloud/core/issues/11925 | ||||
* | | | | | | | | Merge pull request #14330 from ↵ | Lukas Reschke | 2015-02-18 | 2 | -19/+6 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/revert-13879-add_debug_log_for_memcache_instantiation Revert "add debug log for memcache instantiation" | ||||
| * | | | | | | | | 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. | ||||
| * | | | | | | | | 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 | ||||
| * | | | | | | | | | Use APCu only if available in version 4.0.6 and higher | Lukas Reschke | 2015-02-17 | 1 | -0/+2 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | APCu before 4.0.6 is unbelievable buggy and tend to segfault the PHP process (i.e. the whole webserver) This potentially fixes https://github.com/owncloud/core/issues/14175 Requires a backport to stable8 | ||||
* | | | | | | | | | Merge pull request #14207 from owncloud/propfind-optimize | Morris Jobke | 2015-02-18 | 1 | -18/+27 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Optimize quota calculation for propfind | ||||
| * | | | | | | | | 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 |
| | | | | | | | |