Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move routes to ocs folder | Tom Needham | 2012-07-30 | 1 | -25/+0 |
| | |||||
* | Add core routes and include them in OC_API::call() | Tom Needham | 2012-07-30 | 1 | -0/+25 |
| | |||||
* | CSRF protection for eventsource | Robin Appelman | 2012-07-22 | 2 | -0/+2 |
| | |||||
* | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-21 | 1 | -1/+1 |
|\ | |||||
| * | remove second "autocomplete" statement | Bjoern Schiessle | 2012-07-18 | 1 | -1/+1 |
| | | |||||
| * | remember username and provide autocomplete feature | Bjoern Schiessle | 2012-07-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-11 | 9 | -15/+1 |
|\| | |||||
| * | remove superfluous ?> at the end of .php files (left out apps/*/templates) | Jörn Friedrich Dreyer | 2012-07-09 | 8 | -14/+0 |
| | | |||||
| * | Fix time formatting for minutes, prepend 0 if minutes is less than 10 | Michael Gapczynski | 2012-07-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-07-04 | 1 | -0/+2 |
|\| | |||||
| * | Add slash to app url if not set fix oc-1169 | Brice Maron | 2012-07-03 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into calendar_import | Georg Ehrke | 2012-06-30 | 1 | -3/+15 |
|\| | |||||
| * | Prevent adding a duplicate to a multiselect | Michael Gapczynski | 2012-06-29 | 1 | -1/+12 |
| | | |||||
| * | Add new group to other user's group select forms | Michael Gapczynski | 2012-06-29 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-26 | 3 | -2/+3 |
|\| | |||||
| * | typo in js statement fixed | Bjoern Schiessle | 2012-06-26 | 1 | -1/+1 |
| | | |||||
| * | Added text ACS warning to admin's user settings page, and corresponding CSS ↵ | Sam Tuke | 2012-06-25 | 1 | -0/+1 |
| | | | | | | | | styles | ||||
| * | add x-webkit-speech to searchbox | Georg Ehrke | 2012-06-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-22 | 4 | -10/+7 |
|\| | |||||
| * | Fixes for multi app dir : | Brice Maron | 2012-06-22 | 1 | -2/+1 |
| | | | | | | | | | | Url should be given as relative path (to webroot) Correct link construction from js | ||||
| * | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-21 | 4 | -16/+16 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/app.php lib/base.php lib/minimizer/css.php lib/minimizer/js.php lib/template.php lib/util.php | ||||
| | * | use new sanitizeHTML() function | Bjoern Schiessle | 2012-06-21 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-14 | 6 | -10/+26 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php | ||||
| * \ \ | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-07 | 1 | -1/+0 |
| |\ \ \ | |||||
| * | | | | Change app path logic in templates | Brice Maron | 2012-06-06 | 3 | -8/+5 |
| | | | | | |||||
| * | | | | Unit path and webpath, correct some more | Brice Maron | 2012-06-06 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-19 | 2 | -3/+3 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | CSS class headerAction -> header-action | Florian Hülsmann | 2012-06-18 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | added CSS class .headerAction | Florian Hülsmann | 2012-06-18 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-18 | 1 | -2/+2 |
|\| | | | | |||||
| * | | | | Use TemplateLayout functions for finding js and css files in minimizer | Bart Visscher | 2012-06-18 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-18 | 3 | -10/+9 |
|\| | | | | |||||
| * | | | | corrected header width and floating (can now dynamically add stuff to ↵ | Florian Hülsmann | 2012-06-18 | 2 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | header); someone may test this in IE | ||||
| * | | | | Cache the minimized output also on the server | Bart Visscher | 2012-06-18 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-17 | 1 | -0/+1 |
|\| | | | | |||||
| * | | | | Add session_write_close to the minimizer | Bart Visscher | 2012-06-16 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-15 | 4 | -3/+13 |
|\| | | | |||||
| * | | | Make requesttoken global. | Thomas Tanghus | 2012-06-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge commit 'refs/merge-requests/127' of ↵ | Michael Gapczynski | 2012-06-13 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/owncloud/owncloud into merge-requests/127 Conflicts: apps/files_external/templates/settings.php lib/template.php | ||||
| | * | | | Removed some unessecary sanitizations | Lukas Reschke | 2012-06-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Make some apps compatible | Lukas Reschke | 2012-06-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added JSON methods for CSRF prevention. Make request token accessible from ↵ | Thomas Tanghus | 2012-06-13 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | template and add js var. | ||||
| * | | | | urlencode link fort password reset (bug #970) | Bjoern Schiessle | 2012-06-13 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-10 | 1 | -3/+9 |
|\| | | | |||||
| * | | | fix potential xss in multiselect | Robin Appelman | 2012-06-09 | 1 | -3/+9 |
| | | | | |||||
* | | | | fix merge conflicts | Georg Ehrke | 2012-06-08 | 3 | -5/+4 |
|\| | | | |||||
| * | | | Better handling of core.css and core.js | Bart Visscher | 2012-06-07 | 2 | -4/+4 |
| | |/ | |/| | | | | | | | | | | Fixes calling remote.php on install. Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933 | ||||
| * | | Remove old internal mail call for password reset, fixes bug oc-934 | Michael Gapczynski | 2012-06-07 | 1 | -1/+0 |
| |/ | |||||
* | | Merge branch 'master' into oc_error | Georg Ehrke | 2012-06-06 | 20 | -26/+215 |
|\| | |||||
| * | update translations | Robin Appelman | 2012-06-06 | 16 | -25/+188 |
| | |