Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Create only one CSRF token per session | Lukas Reschke | 2012-10-31 | 3 | -27/+6 |
| | | | | | | | | | 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. | ||||
* | Generate only one CSRF token | Lukas Reschke | 2012-10-29 | 1 | -31/+19 |
| | |||||
* | Fix a typo | Lukas Reschke | 2012-10-29 | 1 | -1/+1 |
| | |||||
* | Move loading setting routing to OC_Router | Bart Visscher | 2012-10-29 | 1 | -1/+3 |
| | |||||
* | Remove subnavigation key, not used | Bart Visscher | 2012-10-29 | 1 | -3/+0 |
| | |||||
* | Add ETag caching for Javascript routes | Bart Visscher | 2012-10-29 | 1 | -11/+36 |
| | |||||
* | Move generating cache key from files from OC_Minimizer to OC_Cache | Bart Visscher | 2012-10-29 | 2 | -6/+12 |
| | |||||
* | Fix MySQL install, bug fix for issue 132 | Michael Gapczynski | 2012-10-28 | 1 | -2/+2 |
| | |||||
* | Check if error_report() is equal to 0, so suppressed errors aren't logged ↵ | Michael Gapczynski | 2012-10-28 | 1 | -0/+3 |
| | | | | e.g. the htaccesstext.txt fopen failing | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-29 | 4 | -2/+4 |
| | |||||
* | NoSpaceAfterComma | Felix Moeller | 2012-10-28 | 2 | -59/+59 |
| | |||||
* | NoSpaceAfterComma | Felix Moeller | 2012-10-28 | 2 | -41/+41 |
| | | | | first in new branch | ||||
* | add svg mimetype to default htaccess | Robin Appelman | 2012-10-28 | 1 | -0/+4 |
| | |||||
* | check if RUNTIME_NOAPPS is set before using it | Arthur Schiwon | 2012-10-28 | 1 | -1/+1 |
| | |||||
* | deny the usage of dots in database name | Georg Ehrke | 2012-10-28 | 1 | -0/+3 |
| | |||||
* | make sure all filesystem apps are loaded when setupFS is proceeded, to make ↵ | Arthur Schiwon | 2012-10-28 | 1 | -0/+5 |
| | | | | sure the emmited setup-hook is received. Fixes #89 | ||||
* | remove whitespaces, no code change | Arthur Schiwon | 2012-10-28 | 1 | -4/+4 |
| | |||||
* | added functions for printing escaped and unescaped values | Bernhard Posselt | 2012-10-28 | 1 | -0/+16 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-28 | 1 | -0/+1 |
| | |||||
* | Fix introduced style errors | Bart Visscher | 2012-10-27 | 4 | -35/+43 |
| | |||||
* | Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git' | Bart Visscher | 2012-10-27 | 2 | -12/+15 |
|\ | | | | | | | | | Conflicts: lib/base.php | ||||
| * | Update Sabre to version 1.7.1 | Susinthiran Sithamparanathan | 2012-10-17 | 2 | -12/+17 |
| | | |||||
* | | fix function documentation | Björn Schießle | 2012-10-27 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'routing' | Bart Visscher | 2012-10-27 | 7 | -87/+452 |
|\ \ | | | | | | | | | | | | | | | | 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 | 38 | -171/+632 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php | ||||
| | * | | Check for file exists before loading app version file | Bart Visscher | 2012-10-17 | 1 | -3/+2 |
| | | | | |||||
| * | | | Add API description to OC_Route and OC_Router | Bart Visscher | 2012-10-05 | 2 | -0/+71 |
| | | | | |||||
| * | | | Implement routing on javascript side | Bart Visscher | 2012-10-05 | 2 | -0/+19 |
| | | | | |||||
| * | | | fix actioninclude | Bart Visscher | 2012-09-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Convert menu entries of settings pages to use router | Bart Visscher | 2012-09-28 | 1 | -6/+12 |
| | | | | |||||
| * | | | Implement route for download in OC_Search_Provider_File | Bart Visscher | 2012-09-28 | 2 | -2/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 7 | -25/+58 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 68 | -1145/+1765 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php | ||||
| * | | | | | Add linkToRoute functionality | Bart Visscher | 2012-09-12 | 2 | -6/+37 |
| | | | | | | |||||
| * | | | | | Remove redundant loadApps | Bart Visscher | 2012-09-07 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into routing | Bart Visscher | 2012-09-07 | 116 | -1879/+2265 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 71 | -448/+662 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'gitorious/master' into routing | Bart Visscher | 2012-08-29 | 45 | -242/+1903 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-15 | 20 | -80/+155 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Routing: And start using them from php | Bart Visscher | 2012-08-12 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Routing: Add some core routes | Bart Visscher | 2012-08-12 | 2 | -1/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | 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 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Routing: Fix construction of RequestContext | Bart Visscher | 2012-08-11 | 1 | -1/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into routing | Bart Visscher | 2012-08-11 | 43 | -282/+1553 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/base.php | ||||
| * | | | | | | | | | | Fix for running doing routing in lib/ocs.php | Bart Visscher | 2012-08-11 | 3 | -5/+14 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Routing: combine all routes into one set | Bart Visscher | 2012-08-10 | 1 | -8/+12 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Move loading of routes to OC::getRouter function | Bart Visscher | 2012-08-10 | 2 | -1/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Change access to router object to getter function | Bart Visscher | 2012-08-10 | 1 | -6/+12 |
| | | | | | | | | | | |