aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Contacts: fix add contact icon pathTom Needham2012-06-301-1/+1
* 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 WebDAV external storage opendir() and stat() for directories, bug fix for...Michael Gapczynski2012-06-291-14/+12
| * Increment user_openid version to load new app typeBart Visscher2012-06-291-1/+1
| * Coding style fixesBart Visscher2012-06-292-2/+2
| * Whitespace fixesBart Visscher2012-06-293-8/+0
| * fix displaying of eventsGeorg Ehrke2012-06-291-1/+3
| * add some hooks to fix calendar sharingGeorg Ehrke2012-06-292-1/+28
| * Allow multiple Google Drive and Dropbox external storages to be configuredMichael Gapczynski2012-06-292-2/+0
| * Clear the mount point value for the new mount point rowMichael Gapczynski2012-06-291-1/+2
| * Hide the delete button on new mount point rowMichael Gapczynski2012-06-292-1/+2
| * typo fixedBjoern Schiessle2012-06-291-1/+1
| * fix birthday calendarGeorg Ehrke2012-06-292-10/+12
| * - when creating a new text file or directory which name already exist use the...Bjoern Schiessle2012-06-292-4/+13
| * - remove leading http[s] to let createBaseUri() generate secure/unsecure base...Bjoern Schiessle2012-06-291-3/+7
| * Merge branch 'master' of gitorious.org:owncloud/owncloudFrank Karlitschek2012-06-2924-173/+284
| |\
| | * pass progresskey the correct way during calender importRobin Appelman2012-06-291-1/+1
| | * Fix external storage UI for Admin pageMichael Gapczynski2012-06-284-5/+5
| | * Spelling fixBart Visscher2012-06-281-1/+1
| | * Gallery: Get all the image information for a directory at onceBart Visscher2012-06-281-4/+20
| | * Remember the app root information.Bart Visscher2012-06-281-1/+5
| | * Remove redundant code from OC_Helper::linkToBart Visscher2012-06-281-6/+3
| | * Pg setup enhancementBrice Maron2012-06-281-2/+32
| * | move the ownCloud version to admin which makes more sense. A normal user canĀ...Frank Karlitschek2012-06-292-5/+7
* | | 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
|\ \ \ | | |/ | |/|
| * | use public APIBjoern Schiessle2012-06-281-5/+5
| * | adjust the name and/or location of the stored versions if the actual file get...Bjoern Schiessle2012-06-282-3/+27
| * | move hook to erase versions from deleted files to the right placeBjoern Schiessle2012-06-284-41/+15
| * | delete file versions if the user deletes a fileBjoern Schiessle2012-06-282-0/+40
| * | handover the correct timestampBjoern Schiessle2012-06-281-1/+1
* | | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2813-150/+176
|\| |
| * | Return login errors for PostgreSQL setupMichael Gapczynski2012-06-271-0/+1
| * | No need for this anymore.Thomas Tanghus2012-06-281-10/+0
| * | Smoother profile picture loading - hopefully.Thomas Tanghus2012-06-285-59/+56
| * | Don't overwrite fake directory stream for Amazon S3 storageMichael Gapczynski2012-06-271-2/+2
| * | Migration: Fix contacts and bookmarksTom Needham2012-06-272-8/+9
| * | Load contactlist progressivly.Thomas Tanghus2012-06-273-68/+105