summaryrefslogtreecommitdiffstats
path: root/core/templates
Commit message (Expand)AuthorAgeFilesLines
* Use OC_Util::displayLoginPage and cleanup the functionBart Visscher2012-08-101-3/+3
* Small changes to allow updating main menu dynamically.Thomas Tanghus2012-08-051-1/+1
* CSRF protection for eventsourceRobin Appelman2012-07-221-0/+1
* Merge branch 'master' into calendar_importGeorg Ehrke2012-07-211-1/+1
|\
| * remove second "autocomplete" statementBjoern Schiessle2012-07-181-1/+1
| * remember username and provide autocomplete featureBjoern Schiessle2012-07-181-1/+1
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-261-1/+1
|\|
| * add x-webkit-speech to searchboxGeorg Ehrke2012-06-241-1/+1
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-223-4/+4
|\|
| * Merge branch 'master' into multi_app_dirBrice Maron2012-06-212-4/+4
| |\
| | * use new sanitizeHTML() functionBjoern Schiessle2012-06-212-2/+2
| * | Merge branch 'master' into multi_app_dirBrice Maron2012-06-144-6/+16
| |\ \
| * | | Change app path logic in templatesBrice Maron2012-06-062-3/+2
| * | | Unit path and webpath, correct some moreBrice Maron2012-06-061-1/+2
* | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-191-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | CSS class headerAction -> header-actionFlorian Hülsmann2012-06-181-1/+1
* | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-181-2/+2
|\| | |
| * | | corrected header width and floating (can now dynamically add stuff to header)...Florian Hülsmann2012-06-181-2/+2
| | |/ | |/|
* | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-153-2/+12
|\| |
| * | Make requesttoken global.Thomas Tanghus2012-06-141-1/+1
| * | Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/ownclo...Michael Gapczynski2012-06-132-2/+2
| |\ \
| | * | Removed some unessecary sanitizationsLukas Reschke2012-06-111-1/+1
| | * | Make some apps compatibleLukas Reschke2012-06-111-1/+1
| * | | Added JSON methods for CSRF prevention. Make request token accessible from te...Thomas Tanghus2012-06-131-0/+10
| |/ /
* | | fix merge conflictsGeorg Ehrke2012-06-082-4/+4
|\| |
| * | Better handling of core.css and core.jsBart Visscher2012-06-072-4/+4
| |/
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-062-0/+12
|\|
| * Merge branch 'unstable'Bart Visscher2012-06-042-0/+12
| |\
| | * Combine and minimize core and default app js filesBart Visscher2012-05-162-0/+6
| | * Combine and minimize core and default app css filesBart Visscher2012-05-162-0/+6
* | | Merge branch 'master' into oc_errorGeorg Ehrke2012-05-251-1/+1
|\| |
| * | add htmlentities() call into login formMichiel de Jong2012-05-181-1/+1
* | | Merge branch 'master' into oc_errorGeorg Ehrke2012-05-172-2/+2
|\| |
| * | Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/ownclo...Michael Gapczynski2012-05-171-1/+1
| |\ \
| | * | Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-e...Vitaly Kuznetsov2012-05-101-1/+1
| | |/
| * | Sanitize search queries, thanks to Lukas ReschkeMichael Gapczynski2012-05-131-1/+1
* | | Merge branch 'master' into oc_errorGeorg Ehrke2012-05-133-2/+5
|\| |
| * | Remove duplicate lineBart Visscher2012-05-111-1/+0
| |/
| * Made the global settings icon accessable via keyboard.Thomas Tanghus2012-05-041-1/+1
| * add appswebroot to the guest templateGeorg Ehrke2012-05-021-0/+1
| * show the username in the title. good idea.Frank Karlitschek2012-04-301-1/+1
| * Merge branch 'master' into movable_apps_2Georg Ehrke2012-04-271-0/+1
| |\
| | * some more csrf fixesFrank Karlitschek2012-04-261-0/+1
| * | fix loading of css files that are core relatedGeorg Ehrke2012-04-261-0/+1
| * | fix position of SemicolonGeorg Ehrke2012-04-241-1/+1
| * | fix pathes in contactsGeorg Ehrke2012-04-241-0/+1
| |/
* | fix merge conflictsGeorg Ehrke2012-04-222-2/+2
|\|
| * fix 2 potential xss problemsRobin Appelman2012-04-161-1/+1
| * updated logos and iconsJan-Christoph Borchardt2012-04-161-1/+1
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-04-151-1/+1
|\|