summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into calendar_importGeorg Ehrke2012-07-0319-70/+202
|\
| * Escape pg connection string on setupBrice Maron2012-07-031-3/+13
| * 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
| * provide multibyte aware helper functions mb_str_replace, mb_substr_replace an...Arthur Schiwon2012-07-022-18/+126
| * webdav client crashes for secure connections if he doesn't have the right roo...Bjoern Schiessle2012-07-022-0/+3
| * LDAP: reset resource on failed bindArthur Schiwon2012-07-021-4/+4
| * Remove forced downloadLukas Reschke2012-07-021-2/+0
| * Merge branch 'master' of gitorious.org:owncloud/owncloudLukas Reschke2012-07-022-2/+2
| |\
| | * fix a small PHP failGeorg Ehrke2012-07-011-1/+1
| | * Don't reload the page after sending private link to email addressMichael Gapczynski2012-07-011-1/+2
| | * Revert "bugfix for #1098 (assigning a group to a user, the group appears incr...Michael Gapczynski2012-07-011-1/+0
| * | Don't display error messagesLukas Reschke2012-07-021-2/+2
| * | fix a small PHP failGeorg Ehrke2012-07-021-1/+1
| |/
| * Disable mimesniffingLukas Reschke2012-07-011-2/+4
| * Fixed app pathTom Needham2012-06-301-1/+1
| * Return correct json response, fix syntaxTom Needham2012-06-301-15/+4
| * 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-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