summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tasksBart Visscher2012-05-0437-643/+5383
|\
| * fix incorrect dialog computing in ffBartek Przybylski2012-05-031-1/+1
| * fix filepicker in webkitBartek Przybylski2012-05-031-1/+1
| * add appswebroot to the guest templateGeorg Ehrke2012-05-021-0/+1
| * correction of bug oc-393 in using owncloud V2, V3, V4 with android browser :unknown2012-05-011-0/+1
| * show the username in the title. good idea.Frank Karlitschek2012-04-301-1/+1
| * removing executable bit from various filesThomas Mueller2012-04-304-0/+0
| * Various file path fixes.Thomas Tanghus2012-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
| * | Merge branch 'master' into movable_apps_2Georg Ehrke2012-04-262-6/+14
| |\|
| | * csrf protectionFrank Karlitschek2012-04-262-6/+14
| * | fix merge conflictsGeorg Ehrke2012-04-262-0/+240
| |\|
| | * added history buttonsSam Tuke2012-04-252-0/+240
| * | fix security check for the path of the requested fileGeorg Ehrke2012-04-261-3/+2
| * | fix downloading of files in files appGeorg Ehrke2012-04-261-2/+3
| * | fix loading of css files that are core relatedGeorg Ehrke2012-04-261-0/+1
| * | some fixes fore movable appsGeorg Ehrke2012-04-262-3/+3
| * | fix OC.filePath in main jsGeorg Ehrke2012-04-241-3/+8
| * | fix position of SemicolonGeorg Ehrke2012-04-241-1/+1
| * | fix pathes in contactsGeorg Ehrke2012-04-242-0/+10
| * | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-232-4/+8
| |\|
| | * fixing multiselect overflow, issue 341Jan-Christoph Borchardt2012-04-231-3/+3
| | * adding proper copyright and license notice to the style filesJan-Christoph Borchardt2012-04-232-1/+5
| * | use native functions of php to parse the string into the VarGeorg Ehrke2012-04-231-1/+1
| * | rename var file to getfile to prevent fails in files appGeorg Ehrke2012-04-231-1/+1
| * | fix merge conflictsGeorg Ehrke2012-04-221-1/+3
| |\|
| | * Personal settings: Emphasized labels etc, mono-spaced generated paths and mov...Thomas Tanghus2012-04-221-0/+2
| | * fix merge conflictsGeorg Ehrke2012-04-211-1/+4
| | |\
| | * \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-04-1822-598/+5052
| | |\ \
| | * \ \ fix merge conflictsGeorg Ehrke2012-04-152-10/+10
| | |\ \ \
| | * \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-04-153-8/+6
| | |\ \ \ \
| | * \ \ \ \ fix merge conflictsGeorg Ehrke2012-04-155-7/+14
| | |\ \ \ \ \
| | * \ \ \ \ \ fix merge conflictsGeorg Ehrke2012-04-138-35/+35
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-04-108-26/+131
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-03-291-0/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-03-271-2/+7
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-03-261-0/+15
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ fix merge conflictsGeorg Ehrke2012-03-251-6/+14
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-03-211-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-03-168-1/+283
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-03-041-12/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ fix merge conflictsGeorg Ehrke2012-03-036-13/+295
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ fix merge conflictsGeorg Ehrke2012-02-2523-20/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-02-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_sharingGeorg Ehrke2012-02-106-0/+546
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendarGeorg Ehrke2012-01-311-3/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendarGeorg Ehrke2012-01-313-0/+114
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | add textfield style declarationGeorg Ehrke2012-01-311-1/+1
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into movable_appsGeorg Ehrke2012-04-201-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 15:41:21 +0000