summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-0310-27/+52
|\|
| * Text editor: Always use UTF-8 to keep Ace happy.Tom Needham2012-07-022-0/+2
| * LDAP: make it UTF-8 saveArthur Schiwon2012-07-025-18/+36
| * webdav client crashes for secure connections if he doesn't have the right roo...Bjoern Schiessle2012-07-021-0/+2
| * LDAP: reset resource on failed bindArthur Schiwon2012-07-021-4/+4
| * Don't reload the page after sending private link to email addressMichael Gapczynski2012-07-011-1/+2
| * Updates contacts migration providerTom Needham2012-06-301-4/+6
* | 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-308-146/+233
|\|
| * 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
| * 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-307-41/+141
|\|
| * fix merge conflictsGeorg Ehrke2012-06-3020-69/+123
| |\
| | * Fix placeholder value for optional fields in external storage UIMichael Gapczynski2012-06-291-1/+1
| | * fix encryption test cases when not logged inRobin Appelman2012-06-301-2/+6
| | * Don't add duplicate contacts in the list when en-/disable an address book.Thomas Tanghus2012-06-291-12/+14
| * | 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-2811-147/+172
| |\ \ \
| * \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-271-11/+48
| |\ \ \ \
| * | | | | fix style of some docGeorg Ehrke2012-06-271-5/+5
| * | | | | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2710-33/+57
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2713-101/+257
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2641-167/+246
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-239-27/+35
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2252-342/+320
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2110-151/+158
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2013-91/+416
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2028-44/+448
| |\ \ \ \ \ \ \ \ \ \ \ \