summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13340 from owncloud/use-http-onlyLukas Reschke2015-02-241-10/+13
|\ | | | | Use "HTTPOnly" for cookies when logging out
| * Use "HTTPOnly" for cookies when logging outLukas Reschke2015-01-141-10/+13
| | | | | | | | | | | | This has no other reason than preventing some insane automated scanners from reporting this as security bug (which it obviously isn't as the cookie contains nothing of value) Thus it generally results in an happier Lukas and hopefully less reports to our support and security mail addresses...
* | Dont break code which relies on the cursor being open after insert/update/deleteBernhard Posselt2015-02-241-1/+0
| |
* | Merge pull request #14009 from owncloud/installing-installed-apps-is-stupidThomas Müller2015-02-243-99/+108
|\ \ | | | | | | don't allow installation of already installed apps - fixes #14004
| * | app store can be used with any editionThomas Müller2015-02-231-3/+1
| | |
| * | don't allow installation of already installed apps - fixes #14004Thomas Müller2015-02-233-99/+110
| | |
* | | Merge pull request #14442 from owncloud/fix-oracle-ci-masterLukas Reschke2015-02-241-1/+2
|\ \ \ | |/ / |/| | Close the cursor after the affected count has been extracted.
| * | Close the cursor after the affected count has been extracted.Thomas Müller2015-02-231-1/+2
| | |
* | | Merge pull request #14416 from owncloud/setup-commandThomas Müller2015-02-235-25/+34
|\ \ \ | | | | | | | | Setup command
| * | | properly initialize OC::$WEBROOT and host nameThomas Müller2015-02-231-1/+1
| | | |
| * | | Fix namespace of OC_Setup -> \OC\SetupThomas Müller2015-02-234-24/+33
| |/ /
* | | Merge pull request #14119 from owncloud/dbal251Thomas Müller2015-02-231-0/+3
|\ \ \ | |/ / |/| | Update doctrine/dbal to 2.5.1 #13537
| * | Skip primary index if the table has oneVictor Dubiniuk2015-02-161-0/+3
| | |
* | | Merge pull request #13829 from owncloud/appmanager-listVincent Petry2015-02-235-111/+166
|\ \ \ | | | | | | | | Better caching for enabled apps
| * | | allow overwriting the appmanager in oc_util by subclassingRobin Appelman2015-02-181-1/+5
| | | |
| * | | Use appmanager in OC_App::enable/disableRobin Appelman2015-02-171-3/+5
| | | |
| * | | better name for getAppsEnabledForUserRobin Appelman2015-02-172-2/+2
| | | |
| * | | also set user in UserSession when doing OC_User::setUserIdRobin Appelman2015-02-171-5/+36
| | | |
| * | | better user group cachingRobin Appelman2015-02-171-10/+1
| | | |
| * | | Update cache when enabling/disabling appsRobin Appelman2015-02-171-1/+4
| | | |
| * | | Use the app manager from oc_appRobin Appelman2015-02-161-75/+67
| | | |
| * | | Add getInstalledApps and getAppsForUser to the app managerRobin Appelman2015-02-161-17/+49
| | | |
* | | | Merge pull request #14427 from owncloud/fix-some-php-docsBernhard Posselt2015-02-231-3/+4
|\ \ \ \ | | | | | | | | | | Fix some PHPDocs
| * | | | Fix some PHPDocsLukas Reschke2015-02-231-3/+4
| | | | |
* | | | | Merge pull request #14403 from owncloud/update-license-headersThomas Müller2015-02-23315-2696/+6199
|\ \ \ \ \ | |/ / / / |/| | | | Update license headers
| * | | | Updating license headersJenkins for ownCloud2015-02-23315-2696/+6199
| | | | |
* | | | | Merge pull request #14422 from owncloud/use-off-and-offThomas Müller2015-02-231-1/+4
|\ \ \ \ \ | | | | | | | | | | | | Use "off" and "off" instead of true booleans
| * | | | | Use "off" and "off" instead of true booleansLukas Reschke2015-02-231-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/masterLukas Reschke2015-02-231-3/+6
|\ \ \ \ \ | |/ / / / |/| | | | DAV authentication: use Owncloud's internal user instead of HTTP auth one
| * | | | DAV authentication: also use Owncloud's internal user for short-circuitChristian Seiler2015-02-161-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 oneChristian Seiler2015-02-161-2/+5
| | | | | | | | | | | | | | | | | | | | Fixes: #14048, #14104, calendar#712
* | | | | Add helper to check for `ini` values in `OC_Util::checkServer`Lukas Reschke2015-02-211-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-cursorLukas Reschke2015-02-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Close cursor for appframework and manipulation queries if applicable
| * | | | | ignore cursorclosingBernhard Posselt2015-01-291-0/+1
| | | | | |
* | | | | | Merge pull request #13767 from owncloud/issue/13764-mimetype-raceconditionThomas Müller2015-02-201-3/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use insertIfNotExists() and reload mimetypes after inserting one
| * | | | | | Use insertIfNotExists() and reload mimetypes after inserting oneJoas Schilling2015-02-021-3/+7
| | | | | | |
* | | | | | | Merge pull request #14359 from owncloud/add-satisfy-allLukas Reschke2015-02-201-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add `Satisfy All`
| * | | | | | | Add `Satisfy All`Lukas Reschke2015-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/14356
* | | | | | | | Port of #14041 to masterArthur Schiwon2015-02-191-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-viewThomas Müller2015-02-191-6/+132
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Disallow path traversals in file view
| * | | | | | | | Add some basic PHPDoc to functionsLukas Reschke2015-02-181-6/+124
| | | | | | | | |
| * | | | | | | | Prevent directory traversals in ctr of \OC\Files\ViewLukas Reschke2015-02-181-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-updateThomas Müller2015-02-192-1/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Dont update the cache when working with part files
| * | | | | | | Dont bother updating the cache when working with part filesRobin Appelman2015-02-051-0/+12
| | | | | | | |
| * | | | | | | Dont update the cache after fopenRobin Appelman2015-02-051-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #13989 from owncloud/enhancment/security/11857Clark Tomlinson2015-02-181-6/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow AppFramework applications to specify a custom CSP header
| * | | | | | | | Allow AppFramework applications to specify a custom CSP headerLukas Reschke2015-02-161-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 Reschke2015-02-182-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 Reschke2015-02-182-19/+6
| | | | | | | | | |
* | | | | | | | | | Use the untrusted domain in the installerLukas Reschke2015-02-181-2/+2
|/ / / / / / / / /