Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into filesystem | Robin Appelman | 2012-11-16 | 1 | -0/+1 |
|\ | |||||
| * | When using routing in apps, no apps are loaded in the left navigation tree. T... | Bernhard Posselt | 2012-11-15 | 1 | -0/+1 |
* | | merge master into filesystem | Robin Appelman | 2012-11-15 | 1 | -16/+10 |
|\| | |||||
| * | Merge pull request #157 from owncloud/setup | Bart Visscher | 2012-11-12 | 1 | -14/+2 |
| |\ | |||||
| | * | DRY for creating htaccess to protect data-directory | Bart Visscher | 2012-10-30 | 1 | -3/+1 |
| | * | Separate control code from class definition | Bart Visscher | 2012-10-30 | 1 | -11/+1 |
| * | | Added CRUDS permissions to the OCP namespace. Implements issue #345 | Thomas Tanghus | 2012-11-11 | 1 | -2/+4 |
| * | | Fix WebDAV (and Android Client) not being able to authorize on Debian Squeeze... | Stefan Seidel | 2012-11-09 | 1 | -0/+4 |
* | | | merge master into filesystem | Robin Appelman | 2012-11-07 | 1 | -6/+4 |
|\| | | |||||
| * | | Style: Remove all the dangling white spaces | Felix Moeller | 2012-11-04 | 1 | -2/+2 |
| * | | Checkstyle: Fix last six NewlineBeforeOpenBrace | Felix Moeller | 2012-11-04 | 1 | -4/+2 |
* | | | merge master into filesystem | Robin Appelman | 2012-11-04 | 1 | -6/+4 |
|\| | | |||||
| * | | Merge pull request #238 from fmms/checkstyle04 | Thomas Müller | 2012-11-04 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | Checkstyle fixes: NoSpaceAfterComma | Felix Moeller | 2012-11-04 | 1 | -4/+4 |
| | |/ | |||||
| * | | Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession | Lukas Reschke | 2012-11-04 | 1 | -2/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | Create only one CSRF token per session | Lukas Reschke | 2012-10-31 | 1 | -2/+0 |
* | | | merge master into filesystem | Robin Appelman | 2012-10-30 | 1 | -0/+10 |
|\| | | |||||
| * | | Don't use OC_Setup as it will show up the installer | Lukas Reschke | 2012-10-29 | 1 | -1/+5 |
| * | | Generate .htaccess when upgrading from old versions | Lukas Reschke | 2012-10-29 | 1 | -0/+6 |
| |/ | |||||
* | | merge master into filesystem | Robin Appelman | 2012-10-27 | 1 | -1/+5 |
|\| | |||||
| * | Fix introduced style errors | Bart Visscher | 2012-10-27 | 1 | -1/+2 |
| * | Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git' | Bart Visscher | 2012-10-27 | 1 | -0/+3 |
| |\ | |||||
| | * | Update Sabre to version 1.7.1 | Susinthiran Sithamparanathan | 2012-10-17 | 1 | -0/+5 |
* | | | Merge branch 'master' into filesystem | Robin Appelman | 2012-10-27 | 1 | -11/+42 |
|\| | | |||||
| * | | Merge branch 'routing' | Bart Visscher | 2012-10-27 | 1 | -11/+42 |
| |\ \ | |||||
| | * | | Change Symfony/Component/Routing from submodule to composer fetching | Bart Visscher | 2012-10-27 | 1 | -2/+2 |
| | * | | Merge branch 'master' into routing | Bart Visscher | 2012-10-17 | 1 | -26/+85 |
| | |\| | |||||
| | * | | Implement routing on javascript side | Bart Visscher | 2012-10-05 | 1 | -0/+1 |
| | * | | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 1 | -0/+2 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 1 | -5/+7 |
| | |\ \ \ | |||||
| | * | | | | Remove redundant loadApps | Bart Visscher | 2012-09-07 | 1 | -1/+0 |
| | * | | | | Merge branch 'master' into routing | Bart Visscher | 2012-09-07 | 1 | -87/+113 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-30 | 1 | -3/+7 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-15 | 1 | -19/+20 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Routing: Add some core routes | Bart Visscher | 2012-08-12 | 1 | -1/+2 |
| | * | | | | | | | Routing: Prepare load funtions to be called from OC_Router | Bart Visscher | 2012-08-12 | 1 | -11/+14 |
| | * | | | | | | | Add router match to OC::handleRequest | Bart Visscher | 2012-08-11 | 1 | -0/+9 |
| | * | | | | | | | Merge branch 'master' into routing | Bart Visscher | 2012-08-11 | 1 | -37/+176 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Move loading of routes to OC::getRouter function | Bart Visscher | 2012-08-10 | 1 | -0/+1 |
| | * | | | | | | | | Change access to router object to getter function | Bart Visscher | 2012-08-10 | 1 | -6/+12 |
| | * | | | | | | | | Create OC_Router in OC::init | Bart Visscher | 2012-08-10 | 1 | -0/+6 |
| | * | | | | | | | | Merge branch 'master' into routing | Bart Visscher | 2012-07-25 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Very basic conversion of ocs to Symfony Routing Component | Bart Visscher | 2012-07-21 | 1 | -0/+3 |
* | | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-24 | 1 | -1/+1 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Make Jenkins more happy. | Felix Moeller | 2012-10-23 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-10-17 | 1 | -16/+70 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Use `get_magic_quotes_gpc()` to determine if magic_quotes is enabled | Lukas Reschke | 2012-10-16 | 1 | -1/+1 |
| * | | | | | | | | | Merge pull request #31 from visit1985/persistentcookies | Lukas Reschke | 2012-10-16 | 1 | -10/+60 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | 128byte is not 128bit - now we realy use 256bit (same as PHPSESSID) | Michael Göhler | 2012-10-15 | 1 | -2/+2 |
| | * | | | | | | | | | implement fixed php session timeout and session id regeneration | Michael Göhler | 2012-10-14 | 1 | -0/+22 |