summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | fixed settings text not being clickableJan-Christoph Borchardt2012-05-111-2/+2
| * | Fix music file action i.e. click to play, make OC.filePath act like OC_Helper...Michael Gapczynski2012-05-101-4/+7
| * | fixing upload icon colorJan-Christoph Borchardt2012-05-104-4/+77
| * | Make select_all checkbox more centralTom Needham2012-05-101-1/+1
| * | upload button goes MJJan-Christoph Borchardt2012-05-102-6/+6
| |/
| * update translationsRobin Appelman2012-05-0922-70/+315
| * Prevent extra '/' from being added to url if app is not definedMichael Gapczynski2012-05-071-2/+4
| * Fix bug on browsers like rekonq which stopped execution of javascriptSimon Birnbach2012-05-071-1/+1
| * improve remote.php and create public.phpGeorg Ehrke2012-05-071-1/+1
| * Merge branch 'tasks' for Tasks appBart Visscher2012-05-052-0/+92
| |\
| | * Tasks: Really correct iconBart Visscher2012-05-042-9/+14
| | * Merge branch 'master' into tasksBart Visscher2012-05-0437-643/+5383
| | |\
| | * | Tasks: Make it possible to close the details areaBart Visscher2012-05-021-0/+87
| * | | Custom icons for contacts appFlorian Hülsmann2012-05-052-324/+37
| * | | Dialogs: Clean indentation. Add some missing brackets.Thomas Tanghus2012-05-051-220/+239
| * | | Tried to make settings/apps more keyboard/screenreader friendly.Thomas Tanghus2012-05-041-0/+1
| * | | Made the global settings icon accessable via keyboard.Thomas Tanghus2012-05-042-1/+6
| * | | VCategories: Check if any categories are selected before json call. Add Close...Thomas Tanghus2012-05-041-5/+8
| * | | Check for callback in OC.dialogs.alert.Thomas Tanghus2012-05-041-1/+1
| | |/ | |/|
| * | fix incorrect dialog computing in ffBartek Przybylski2012-05-031-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 03:38:54 +0000