summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge branch 'master' into multi_app_dirBrice Maron2012-06-071-1/+0
| |\ \ \
| * | | | Change app path logic in templatesBrice Maron2012-06-063-8/+5
| * | | | Unit path and webpath, correct some moreBrice Maron2012-06-061-1/+2
* | | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-192-3/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | CSS class headerAction -> header-actionFlorian Hülsmann2012-06-182-3/+3
| * | | | added CSS class .headerActionFlorian Hülsmann2012-06-181-2/+2
* | | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-181-2/+2
|\| | | |
| * | | | Use TemplateLayout functions for finding js and css files in minimizerBart Visscher2012-06-181-2/+2
* | | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-183-10/+9
|\| | | |
| * | | | corrected header width and floating (can now dynamically add stuff to header)...Florian Hülsmann2012-06-182-8/+7
| * | | | Cache the minimized output also on the serverBart Visscher2012-06-181-2/+2
* | | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-171-0/+1
|\| | | |
| * | | | Add session_write_close to the minimizerBart Visscher2012-06-161-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-154-3/+13
|\| | |
| * | | 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
| * | | | urlencode link fort password reset (bug #970)Bjoern Schiessle2012-06-131-1/+1
| |/ / /
* | | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-101-3/+9
|\| | |
| * | | fix potential xss in multiselectRobin Appelman2012-06-091-3/+9
* | | | fix merge conflictsGeorg Ehrke2012-06-083-5/+4
|\| | |
| * | | Better handling of core.css and core.jsBart Visscher2012-06-072-4/+4
| | |/ | |/|
| * | Remove old internal mail call for password reset, fixes bug oc-934Michael Gapczynski2012-06-071-1/+0
| |/
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-0620-26/+215
|\|
| * update translationsRobin Appelman2012-06-0616-25/+188
| * Fix remap dir for CSS minimizerBart Visscher2012-06-051-1/+1
| * Load apps before minimizing the core css and jsBart Visscher2012-06-041-0/+2
| * Merge branch 'unstable'Bart Visscher2012-06-043-0/+24
| |\
| | * Combine and minimize core and default app js filesBart Visscher2012-05-163-3/+16
| | * Combine and minimize core and default app css filesBart Visscher2012-05-163-0/+11
* | | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-041-1/+1
|\| |
| * | use our own serverHost call so that ownCloud works with reverse proxy serversFrank Karlitschek2012-05-311-1/+1
* | | Merge branch 'master' into oc_errorGeorg Ehrke2012-05-262-2/+2
|\| |
| * | update copyrightFrank Karlitschek2012-05-262-2/+2
* | | Merge branch 'master' into oc_errorGeorg Ehrke2012-05-254-1/+1
|\| |
| * | oc-657: icons for M$ office file typesThomas Mueller2012-05-213-0/+0
| * | add htmlentities() call into login formMichiel de Jong2012-05-181-1/+1
* | | Merge branch 'master' into oc_errorGeorg Ehrke2012-05-1729-9/+229
|\| |
| * | 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
| | |/
| * | only check our own input fields when determining to show the login buttonRobin Appelman2012-05-171-2/+2
| * | update translationsRobin Appelman2012-05-176-1/+81
| * | move auth.css and remoteStorage-big.png to assets folders From where they can...Michiel de Jong2012-05-142-0/+8
| * | Sanitize search queries, thanks to Lukas ReschkeMichael Gapczynski2012-05-131-1/+1
| * | update translationsRobin Appelman2012-05-1318-4/+136
* | | Merge branch 'master' into oc_errorGeorg Ehrke2012-05-1347-654/+1085
|\| |
| * | update to jquery 1.7.2Robin Appelman2012-05-122-4/+4
| * | Remove duplicate lineBart Visscher2012-05-111-1/+0