aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into calendar_importGeorg Ehrke2012-07-059-151/+123
|\
| * 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
| * More helpfull debug msg for redirectToDefaultPageBart Visscher2012-07-041-4/+5
| * Remove referer check, this is unreliable. The header doesnt need te exist, or...Bart Visscher2012-07-041-15/+0
| * Simplified remote.php file loadingBart Visscher2012-07-041-23/+13
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-0411-37/+183
|\|
| * 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
| * Added undo functionality to delete user procedure on user settings pageSam Tuke2012-07-042-9/+89
| * 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
* | add miniColorsGeorg Ehrke2012-07-047-0/+968
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-043-2/+12
|\|
| * Correct Postgresql connection with space in password. Work around php bugBrice Maron2012-07-041-0/+8
| * Add slash to app url if not set fix oc-1169Brice Maron2012-07-031-0/+2
| * replace some direct links with OC.imagePathGeorg Ehrke2012-07-031-2/+2
* | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-039-340/+392
|\|
| * Merge branch 'master' of gitorious.org:owncloud/owncloudSam Tuke2012-07-034-14/+23
| |\
| | * use filesystem abstraction layer to copy file versionsBjoern Schiessle2012-07-033-4/+13
| * | 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
* | | Merge branch 'master' into calendar_importGeorg Ehrke2012-07-031-2/+2
|\ \ \ | | |/ | |/|
| * | wrong var name fixedBjoern Schiessle2012-07-031-2/+2
| |/
* | 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-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