Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix WebDAV (and Android Client) not being able to authorize on Debian ↵ | Stefan Seidel | 2012-11-09 | 1 | -0/+4 |
| | | | | Squeeze + mod_fcgid installs. | ||||
* | 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 pull request #238 from fmms/checkstyle04 | Thomas Müller | 2012-11-04 | 1 | -4/+4 |
|\ | | | | | Checkstyle fixes | ||||
| * | 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 |
|\ \ | |/ |/| | Just one CSRF token per session | ||||
| * | Create only one CSRF token per session | Lukas Reschke | 2012-10-31 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | Before, the CSRF token expired every hour. We had a script in place which should refresh the token but this don't worked in every case. (Laptop sleeping etc.) With this commit, the token will only get once created for every session so that the "Token expired" warning shouldn't appear. | ||||
* | | 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 |
|/ | | | | | | | When upgrading from old ownCloud versions like 2.x the .htaccess is not generated - which exposes the data to the internet. This fix will generate a .htaccess when upgrading. (And no one exists) Fixes #127 | ||||
* | 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 |
|\ | | | | | | | | | Conflicts: lib/base.php | ||||
| * | Update Sabre to version 1.7.1 | Susinthiran Sithamparanathan | 2012-10-17 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'routing' | Bart Visscher | 2012-10-27 | 1 | -11/+42 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php | ||||
| * | | 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 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php | ||||
| * | | 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 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php | ||||
| * | | | | Remove redundant loadApps | Bart Visscher | 2012-09-07 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into routing | Bart Visscher | 2012-09-07 | 1 | -87/+113 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php | ||||
| * \ \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-30 | 1 | -3/+7 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/js/contacts.js apps/contacts/lib/search.php apps/files_archive/js/archive.js apps/gallery/lib/tiles.php apps/gallery/templates/index.php lib/ocs.php | ||||
| * \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/base.php | ||||
| * | | | | | | | | 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 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Make Jenkins more happy. | Felix Moeller | 2012-10-23 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This is NoSpaceAfterComma | ||||
* | | | | | | | | | Use `get_magic_quotes_gpc()` to determine if magic_quotes is enabled | Lukas Reschke | 2012-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set_magic_quotes_runtime gives a PHP warning | ||||
* | | | | | | | | | Merge pull request #31 from visit1985/persistentcookies | Lukas Reschke | 2012-10-16 | 1 | -10/+60 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | reresubmit: improved persistent cookies :) | ||||
| * | | | | | | | | | 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 |
| | | | | | | | | | | |||||
| * | | | | | | | | | removed username and password from token generation | Michael Göhler | 2012-10-14 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fixed typo and redundant method call | Michael Göhler | 2012-10-14 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | added a warning message to the log when a cookie is rejected | Michael Göhler | 2012-10-14 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fixed wrong variable usage | Michael Göhler | 2012-10-14 | 1 | -5/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | call unsetMagicInCookie if token is invalid | Michael Göhler | 2012-10-14 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | forgot a class name | Michael Göhler | 2012-10-14 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | delete all tokens on password change | Michael Göhler | 2012-10-14 | 1 | -3/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | further improvements on multiple login token support | Michael Göhler | 2012-10-14 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outdated tokens are deleted before checking against cookies if an invalid token is used we delete all stored tokens for saveness used token will be replaced by a new one after successful authentication | ||||
| * | | | | | | | | | improve token security | Michael Göhler | 2012-10-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switched from time() to internal method OC_Util::generate_random_bytes() | ||||
| * | | | | | | | | | Make the lifetime of the remember login cookie | Bart Visscher | 2012-10-14 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Cleanup login tokens on login success | Bart Visscher | 2012-10-14 | 1 | -0/+13 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add support for multiple login cookie tokens | Bart Visscher | 2012-10-14 | 1 | -9/+12 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'extended_log' | Victor Dubiniuk | 2012-10-16 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP errors logging into the owncloud log | ||||
| * | | | | | | | | | | Uncaught exception logging | VicDeo | 2012-09-26 | 1 | -2/+3 |
| | | | | | | | | | | |