summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* comment out some codeGeorg Ehrke2012-07-061-6/+6
* Merge branch 'master' into calendar_importGeorg Ehrke2012-07-068-44/+52
|\
| * No need for being protected.Thomas Tanghus2012-07-061-1/+1
| * Missing requesttokenThomas Tanghus2012-07-061-1/+1
| * Contacts: Fix copy&paste errorBart Visscher2012-07-051-1/+1
| * use OC_Filesystem for rollbackBjoern Schiessle2012-07-051-1/+4
| * check if caview really existsBjoern Schiessle2012-07-051-2/+4
| * moved remove and rename hook to libs/hooks.phpBjoern Schiessle2012-07-053-39/+39
| * disabled user upload of root certificates until sabredav client can handle themBjoern Schiessle2012-07-051-1/+1
| * send ca cert path to sabredav clientBjoern Schiessle2012-07-051-0/+3
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-056-109/+105
|\|
| * Correct db default value.Thomas Tanghus2012-07-051-1/+1
| * Add missing CSRF check.Thomas Tanghus2012-07-052-1/+2
| * Missing update script.Thomas Tanghus2012-07-041-0/+25
| * Remove ugly activation hack.Thomas Tanghus2012-07-044-108/+78
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-049-28/+94
|\|
| * certificate should be only visible for usersBjoern Schiessle2012-07-041-0/+2
| * allow users to upload ssl root certificates for the webdav clientBjoern Schiessle2012-07-046-6/+66
| * Query contacts in batches of 20. Possible fix for oc-1126.Thomas Tanghus2012-07-041-3/+7
| * Moved action buttons down to the add field menu. Fixes oc-1155.Thomas Tanghus2012-07-042-19/+19
* | 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
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-037-339/+390
|\|
| * Merge branch 'master' of gitorious.org:owncloud/owncloudSam Tuke2012-07-032-12/+20
| |\
| | * use filesystem abstraction layer to copy file versionsBjoern Schiessle2012-07-031-3/+11
| * | Moved hooks and versions.php into new lib directorySam Tuke2012-07-036-338/+381
| |/
* | 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