summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsGeorg Ehrke2012-07-119-15/+1
|\
| * remove superfluous ?> at the end of .php files (left out apps/*/templates)Jörn Friedrich Dreyer2012-07-098-14/+0
| * Fix time formatting for minutes, prepend 0 if minutes is less than 10Michael Gapczynski2012-07-061-1/+1
* | Merge branch 'master' into subadminGeorg Ehrke2012-07-052-3/+17
|\|
| * Add slash to app url if not set fix oc-1169Brice Maron2012-07-031-0/+2
| * Prevent adding a duplicate to a multiselectMichael Gapczynski2012-06-291-1/+12
| * Add new group to other user's group select formsMichael Gapczynski2012-06-291-2/+3
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-263-2/+3
|\|
| * typo in js statement fixedBjoern Schiessle2012-06-261-1/+1
| * Added text ACS warning to admin's user settings page, and corresponding CSS s...Sam Tuke2012-06-251-0/+1
| * add x-webkit-speech to searchboxGeorg Ehrke2012-06-241-1/+1
* | Merge branch 'master' into oc_errorGeorg Ehrke2012-06-224-10/+7
|\|
| * Fixes for multi app dir :Brice Maron2012-06-221-2/+1
| * Merge branch 'master' into multi_app_dirBrice Maron2012-06-214-16/+16
| |\
| | * use new sanitizeHTML() functionBjoern Schiessle2012-06-212-2/+2
| * | Merge branch 'master' into multi_app_dirBrice Maron2012-06-146-10/+26
| |\ \
| * \ \ 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 19:25:00 +0000