summaryrefslogtreecommitdiffstats
path: root/apps/calendar
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-301-7/+43
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-292-0/+7
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-281-2/+2
* Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/ownclou...Georg Ehrke2012-07-271-0/+4
|\
| * Server verhindert beim OSX Client einen DeleteSteven2012-02-131-0/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2012-07-275-30/+167
* | convert through caldav transmitted rgba calendarcolor to rgbGeorg Ehrke2012-07-261-1/+7
* | [tx-robot] updated from transifexJenkins for ownCloud2012-07-261-0/+135
* | [tx-robot] updated from transifexJenkins for ownCloud2012-07-261-7/+43
* | [tx-robot] updated from transifexJenkins for ownCloud2012-07-251-10/+31
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-2125-16/+59
|\ \
| * | some style fixes for calendarGeorg Ehrke2012-07-211-1/+3
| * | DRY for getting calendar timezone settingBart Visscher2012-07-214-5/+15
| * | Add CSRF checksLukas Reschke2012-07-203-2/+8
| * | Added CSRF checks to Calendar. Expect some error messages - and report them ;)Thomas Tanghus2012-07-1714-2/+15
| * | Added hook for postCreateUser. Probably fix for oc-1265.Thomas Tanghus2012-07-172-1/+13
| * | stop using of OC_L10N::tAGeorg Ehrke2012-07-161-4/+4
* | | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-151-1/+1
|\| |
| * | fix remote and public.phpRobin Appelman2012-07-131-1/+1
* | | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-113-1/+8
|\| |
| * | Implemented Sabre iCalendar Export Plugin.Thomas Tanghus2012-07-083-1/+8
* | | comment out some codeGeorg Ehrke2012-07-061-6/+6
* | | some more work on calendar import - new import is (nearly) doneGeorg Ehrke2012-07-045-7/+44
* | | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-041-2/+2
|\| |
| * | replace some direct links with OC.imagePathGeorg Ehrke2012-07-031-2/+2
* | | some more work on calendar importGeorg Ehrke2012-07-035-30/+80
* | | fix spelling fail in codeGeorg Ehrke2012-07-031-1/+1
* | | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-031-1/+1
|\| |
| * | fix encoding fail in calendar app - bugfix for oc-1194Georg Ehrke2012-07-031-1/+1
* | | some work on calendar import dialogGeorg Ehrke2012-07-036-70/+132
* | | remove some whitespaceGeorg Ehrke2012-07-011-2/+0
* | | some work on calendar importGeorg Ehrke2012-07-014-83/+151
* | | use light grey instead of whiteGeorg Ehrke2012-07-011-1/+1
* | | fix doc for OC_Calendar_Calendar::generateTextColor()Georg Ehrke2012-07-011-1/+2
* | | add algorithm to generate the calendar's text colorGeorg Ehrke2012-07-011-1/+18
* | | improvements for dropoimportGeorg Ehrke2012-06-303-7/+25
* | | little fix for importGeorg Ehrke2012-06-301-1/+2
* | | improve dropimportGeorg Ehrke2012-06-303-2/+23
* | | Merge branch 'master' into calendar_importGeorg Ehrke2012-06-306-145/+231
|\| |
| * | fix documentation styleGeorg Ehrke2012-06-306-101/+186
| * | fix some docGeorg Ehrke2012-06-301-42/+42
| * | some improvements for calendar exportGeorg Ehrke2012-06-301-2/+3
* | | import works now for dropimportGeorg Ehrke2012-06-302-22/+36
* | | some work on (drop)import)Georg Ehrke2012-06-305-86/+94
* | | Merge branch 'master' into calendar_importGeorg Ehrke2012-06-304-26/+120
|\| |
| * | fix merge conflictsGeorg Ehrke2012-06-304-9/+38
| |\ \
| * | | fix for previous commitGeorg Ehrke2012-06-281-0/+1
| * | | use OC_Calendar_Export for publicly shared calendarsGeorg Ehrke2012-06-281-13/+21
| * | | Calendar Export: replace spaces with dashes in the name of the calendar / eventGeorg Ehrke2012-06-281-2/+2
| * | | some changes and more doc for OC_Calendar_Export classGeorg Ehrke2012-06-281-19/+55