Commit Graph

5261 Commits

Author SHA1 Message Date
Georg Ehrke 91d92aed02 fix for previous commit 2012-06-28 19:13:43 +02:00
Georg Ehrke 4b3af1f73b use OC_Calendar_Export for publicly shared calendars 2012-06-28 19:12:50 +02:00
Georg Ehrke 930bbeabd4 Calendar Export: replace spaces with dashes in the name of the calendar / event 2012-06-28 19:04:14 +02:00
Georg Ehrke 9dd7ca2667 some changes and more doc for OC_Calendar_Export class 2012-06-28 18:54:13 +02:00
Georg Ehrke 9a4709e68d fix calendar export for Apple iCal - i hate bloody line ends 2012-06-28 16:41:00 +02:00
Georg Ehrke c4f5639cb4 Merge branch 'master' into calendar_export 2012-06-28 15:24:30 +02:00
Bjoern Schiessle bdd1baeb85 use public API 2012-06-28 14:18:57 +02:00
Bjoern Schiessle e5792cc064 adjust the name and/or location of the stored versions if the actual file gets moved or renamed 2012-06-28 14:06:20 +02:00
Bjoern Schiessle f22f49671b move hook to erase versions from deleted files to the right place 2012-06-28 12:42:47 +02:00
Bjoern Schiessle 52f99a7570 delete file versions if the user deletes a file 2012-06-28 11:48:57 +02:00
Bjoern Schiessle dac539b619 handover the correct timestamp 2012-06-28 11:46:17 +02:00
Georg Ehrke 3cea1b062e Merge branch 'master' into calendar_export 2012-06-28 09:27:54 +02:00
Michael Gapczynski 81953e7bb5 Return login errors for PostgreSQL setup 2012-06-27 20:24:06 -04:00
Thomas Tanghus e04a605b9b No need for this anymore. 2012-06-28 01:51:42 +02:00
Thomas Tanghus a48aba316e Smoother profile picture loading - hopefully. 2012-06-28 01:46:33 +02:00
Michael Gapczynski db6139fd41 Don't overwrite fake directory stream for Amazon S3 storage 2012-06-27 19:44:52 -04:00
Tom Needham 426193cf6c Migration: Fix contacts and bookmarks 2012-06-27 21:18:31 +00:00
Thomas Tanghus 77b7f214d2 Load contactlist progressivly. 2012-06-27 22:44:28 +02:00
Tom Needham 7284e57c91 Migration: fix app paths 2012-06-27 20:43:33 +00:00
Georg Ehrke e029e8cb14 Merge branch 'master' into calendar_export 2012-06-27 22:27:55 +02:00
Georg Ehrke 8712754f8c fix style of some doc 2012-06-27 22:27:48 +02:00
Georg Ehrke 1f738d8c9f Merge branch 'master' into calendar_export 2012-06-27 22:24:12 +02:00
Brice Maron 2706988225 Set table prefix if not set in postgresql install 2012-06-27 16:08:46 -04:00
Michael Gapczynski 9b605969f1 Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend 2012-06-27 15:23:49 -04:00
Georg Ehrke 77c66e8cc4 move some documentation to the right place 2012-06-27 21:05:46 +02:00
Georg Ehrke 25a50f00bd add merge calendar function and add some documentation to OC_Calendar_Calendar 2012-06-27 20:56:58 +02:00
Michael Gapczynski b7f86cf282 Add Samba Share parameter to external storage UI 2012-06-27 12:24:21 -04:00
Michael Gapczynski 2c773d549d Don't overwrite fake directory stream for Shared storage 2012-06-27 12:07:42 -04:00
Michael Gapczynski 19f94774fb Don't overwrite fake directory stream for Dropbox and Google Drive 2012-06-27 12:04:33 -04:00
Bjoern Schiessle c67ae2e7f1 no reason to strip tags at this point 2012-06-27 15:56:14 +02:00
Bjoern Schiessle d5237c42bc Util::formatDate() expect $timestamp as double 2012-06-27 15:05:40 +02:00
Bart Visscher 2d8a380a21 Fix recursion when running an update script 2012-06-27 14:56:34 +02:00
Georg Ehrke 90b5cf680f Merge branch 'master' into calendar_export 2012-06-27 14:05:11 +02:00
Robin Appelman 12f7cb8767 fix running tests from cli 2012-06-27 13:21:45 +02:00
Robin Appelman 420d23a875 fix webdav errors for empty folders 2012-06-27 13:08:16 +02:00
Bjoern Schiessle 060a297260 enable highlighting of address in OSM. 2012-06-27 11:46:42 +02:00
Michael Gapczynski 79da782892 Improve error handling of Dropbox storage backend 2012-06-26 20:37:50 -04:00
Thomas Tanghus 3edc40a68a Load default categories if there are none, 2012-06-27 02:12:53 +02:00
Thomas Tanghus 823bef3a09 Ensure event handlers are being set when adding first contact. 2012-06-27 02:12:53 +02:00
Thomas Tanghus afd9705283 Add check for return value. 2012-06-27 02:12:53 +02:00
Bart Visscher 153ee9dcfa Check if app is enabled before loading in remote and public.php 2012-06-27 01:05:12 +02:00
Bart Visscher dab58f3464 Cache result of OC_App::getAppVersions 2012-06-27 01:05:12 +02:00
Bart Visscher 2f0b4983e9 Move app upgrade check to loading of apps 2012-06-27 01:05:12 +02:00
Thomas Tanghus a25ae4b4b6 Make Categories a bit quieter. 2012-06-27 01:03:53 +02:00
Michael Gapczynski f55f13eebc Don't call getLocalFile() until you know it actually is music 2012-06-26 14:51:31 -04:00
Thomas Tanghus cad282b73f Added some error checking. 2012-06-26 18:15:24 +02:00
Thomas Tanghus 1b2d09f9ca Added missing requesttoken. 2012-06-26 18:15:24 +02:00
Thomas Tanghus d8b181cd84 Added error checking on all db queries. 2012-06-26 18:15:24 +02:00
Thomas Tanghus db115429f7 Added createUser hook. 2012-06-26 18:15:24 +02:00
Bjoern Schiessle de4a540ce6 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-26 16:30:34 +02:00