summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-309-147/+234
|\
| * fix documentation styleGeorg Ehrke2012-06-306-101/+186
| * fixed linkTo()Florian Hülsmann2012-06-301-1/+1
| * fix some docGeorg Ehrke2012-06-301-42/+42
| * some improvements for calendar exportGeorg Ehrke2012-06-301-2/+3
| * Contacts: align the bottom control buttonsTom Needham2012-06-301-0/+1
| * Contacts: fix add contact icon pathTom Needham2012-06-301-1/+1
* | 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-3011-44/+187
|\|
| * fix merge conflictsGeorg Ehrke2012-06-3030-88/+220
| |\
| | * Fix placeholder value for optional fields in external storage UIMichael Gapczynski2012-06-291-1/+1
| | * make sure the filesystem is setup properly for oc_cache_file testsRobin Appelman2012-06-301-0/+19
| | * cant to ttl tests for xcacheRobin Appelman2012-06-301-0/+4
| | * fix encryption test cases when not logged inRobin Appelman2012-06-301-2/+6
| | * Prevent duplicate group showing in multiselect that added the groupMichael Gapczynski2012-06-291-1/+3
| | * Don't add duplicate contacts in the list when en-/disable an address book.Thomas Tanghus2012-06-291-12/+14
| | * Prevent adding a duplicate to a multiselectMichael Gapczynski2012-06-291-1/+12
| | * Add new group to other user's group select formsMichael Gapczynski2012-06-292-2/+9
| * | 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
| * | fix calendar export for Apple iCal - i hate bloody line endsGeorg Ehrke2012-06-281-0/+3
| * | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-283-2/+40
| |\ \
| * \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2813-150/+176
| |\ \ \
| * \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-273-15/+52
| |\ \ \ \
| * | | | | fix style of some docGeorg Ehrke2012-06-271-5/+5
| * | | | | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2711-33/+62
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2720-132/+316
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2662-224/+376
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2315-48/+57
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2284-529/+764
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2111-152/+164
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2015-831/+416
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2035-66/+468
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2023-120/+154
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-194-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-186-10/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1810-263/+217
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1815-97/+261
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-171-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-1710-32/+106
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \