summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Migration: fix app pathsTom Needham2012-06-271-3/+3
* | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-273-15/+52
|\|
| * Set table prefix if not set in postgresql installBrice Maron2012-06-271-1/+1
| * Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and c...Michael Gapczynski2012-06-272-14/+51
* | fix style of some docGeorg Ehrke2012-06-271-5/+5
* | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2711-33/+62
|\|
| * move some documentation to the right placeGeorg Ehrke2012-06-272-13/+20
| * add merge calendar function and add some documentation to OC_Calendar_CalendarGeorg Ehrke2012-06-271-1/+24
| * Add Samba Share parameter to external storage UIMichael Gapczynski2012-06-271-1/+1
| * Don't overwrite fake directory stream for Shared storageMichael Gapczynski2012-06-271-2/+2
| * Don't overwrite fake directory stream for Dropbox and Google DriveMichael Gapczynski2012-06-272-5/+4
| * no reason to strip tags at this pointBjoern Schiessle2012-06-271-1/+0
| * Util::formatDate() expect $timestamp as doubleBjoern Schiessle2012-06-274-10/+6
| * Fix recursion when running an update scriptBart Visscher2012-06-271-0/+5
* | Merge branch 'master' into calendar_exportGeorg Ehrke2012-06-2720-132/+316
|\|
| * fix running tests from cliRobin Appelman2012-06-272-3/+8
| * fix webdav errors for empty foldersRobin Appelman2012-06-271-9/+11
| * enable highlighting of address in OSM.Bjoern Schiessle2012-06-271-1/+1
| * Improve error handling of Dropbox storage backendMichael Gapczynski2012-06-261-4/+8
| * Load default categories if there are none,Thomas Tanghus2012-06-271-6/+29
| * Ensure event handlers are being set when adding first contact.Thomas Tanghus2012-06-271-24/+24
| * Add check for return value.Thomas Tanghus2012-06-271-11/+13
| * Check if app is enabled before loading in remote and public.phpBart Visscher2012-06-272-2/+14
| * Cache result of OC_App::getAppVersionsBart Visscher2012-06-271-0/+4
| * Move app upgrade check to loading of appsBart Visscher2012-06-272-16/+12
| * Make Categories a bit quieter.Thomas Tanghus2012-06-271-1/+10
| * Don't call getLocalFile() until you know it actually is musicMichael Gapczynski2012-06-261-1/+1
| * Added some error checking.Thomas Tanghus2012-06-261-1/+5
| * Added missing requesttoken.Thomas Tanghus2012-06-262-1/+4
| * Added error checking on all db queries.Thomas Tanghus2012-06-263-51/+152
| * Added createUser hook.Thomas Tanghus2012-06-262-0/+11
| * Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-261-1/+1
| |\
| | * Fix variable name.Thomas Tanghus2012-06-261-1/+1
| * | Merge branch 'master' of gitorious.org:owncloud/owncloudBjoern Schiessle2012-06-261-0/+8
| |\|
| | * add OC_Calendar_Object::createUID()Georg Ehrke2012-06-261-0/+8