summaryrefslogtreecommitdiffstats
path: root/lib/base.php
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into filesystemRobin Appelman2012-11-161-0/+1
|\
| * When using routing in apps, no apps are loaded in the left navigation tree. T...Bernhard Posselt2012-11-151-0/+1
* | merge master into filesystemRobin Appelman2012-11-151-16/+10
|\|
| * Merge pull request #157 from owncloud/setupBart Visscher2012-11-121-14/+2
| |\
| | * DRY for creating htaccess to protect data-directoryBart Visscher2012-10-301-3/+1
| | * Separate control code from class definitionBart Visscher2012-10-301-11/+1
| * | Added CRUDS permissions to the OCP namespace. Implements issue #345Thomas Tanghus2012-11-111-2/+4
| * | Fix WebDAV (and Android Client) not being able to authorize on Debian Squeeze...Stefan Seidel2012-11-091-0/+4
* | | merge master into filesystemRobin Appelman2012-11-071-6/+4
|\| |
| * | Style: Remove all the dangling white spacesFelix Moeller2012-11-041-2/+2
| * | Checkstyle: Fix last six NewlineBeforeOpenBraceFelix Moeller2012-11-041-4/+2
* | | merge master into filesystemRobin Appelman2012-11-041-6/+4
|\| |
| * | Merge pull request #238 from fmms/checkstyle04Thomas Müller2012-11-041-4/+4
| |\ \
| | * | Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-041-4/+4
| | |/
| * | Merge pull request #178 from owncloud/JustOneCSRFTokenPerSessionLukas Reschke2012-11-041-2/+0
| |\ \ | | |/ | |/|
| | * Create only one CSRF token per sessionLukas Reschke2012-10-311-2/+0
* | | merge master into filesystemRobin Appelman2012-10-301-0/+10
|\| |
| * | Don't use OC_Setup as it will show up the installerLukas Reschke2012-10-291-1/+5
| * | Generate .htaccess when upgrading from old versionsLukas Reschke2012-10-291-0/+6
| |/
* | merge master into filesystemRobin Appelman2012-10-271-1/+5
|\|
| * Fix introduced style errorsBart Visscher2012-10-271-1/+2
| * Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'Bart Visscher2012-10-271-0/+3
| |\
| | * Update Sabre to version 1.7.1Susinthiran Sithamparanathan2012-10-171-0/+5
* | | Merge branch 'master' into filesystemRobin Appelman2012-10-271-11/+42
|\| |
| * | Merge branch 'routing'Bart Visscher2012-10-271-11/+42
| |\ \
| | * | Change Symfony/Component/Routing from submodule to composer fetchingBart Visscher2012-10-271-2/+2
| | * | Merge branch 'master' into routingBart Visscher2012-10-171-26/+85
| | |\|
| | * | Implement routing on javascript sideBart Visscher2012-10-051-0/+1
| | * | Merge branch 'master' into routingBart Visscher2012-09-281-0/+2
| | |\ \
| | * \ \ Merge branch 'master' into routingBart Visscher2012-09-281-5/+7
| | |\ \ \
| | * | | | Remove redundant loadAppsBart Visscher2012-09-071-1/+0
| | * | | | Merge branch 'master' into routingBart Visscher2012-09-071-87/+113
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-301-3/+7
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-151-19/+20
| | |\ \ \ \ \ \
| | * | | | | | | Routing: Add some core routesBart Visscher2012-08-121-1/+2
| | * | | | | | | Routing: Prepare load funtions to be called from OC_RouterBart Visscher2012-08-121-11/+14
| | * | | | | | | Add router match to OC::handleRequestBart Visscher2012-08-111-0/+9
| | * | | | | | | Merge branch 'master' into routingBart Visscher2012-08-111-37/+176
| | |\ \ \ \ \ \ \
| | * | | | | | | | Move loading of routes to OC::getRouter functionBart Visscher2012-08-101-0/+1
| | * | | | | | | | Change access to router object to getter functionBart Visscher2012-08-101-6/+12
| | * | | | | | | | Create OC_Router in OC::initBart Visscher2012-08-101-0/+6
| | * | | | | | | | Merge branch 'master' into routingBart Visscher2012-07-251-0/+3
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Very basic conversion of ocs to Symfony Routing ComponentBart Visscher2012-07-211-0/+3
* | | | | | | | | | | merge master into filesystemRobin Appelman2012-10-241-1/+1
|\| | | | | | | | | |
| * | | | | | | | | | Make Jenkins more happy.Felix Moeller2012-10-231-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | merge master into filesystemRobin Appelman2012-10-171-16/+70
|\| | | | | | | | |
| * | | | | | | | | Use `get_magic_quotes_gpc()` to determine if magic_quotes is enabledLukas Reschke2012-10-161-1/+1
| * | | | | | | | | Merge pull request #31 from visit1985/persistentcookiesLukas Reschke2012-10-161-10/+60
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 128byte is not 128bit - now we realy use 256bit (same as PHPSESSID)Michael Göhler2012-10-151-2/+2
| | * | | | | | | | | implement fixed php session timeout and session id regenerationMichael Göhler2012-10-141-0/+22