Commit Graph

96 Commits

Author SHA1 Message Date
Georg Ehrke f9d3388854 Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
Georg Ehrke bd91ee4d22 add SabreDav 1.6.3 files 2012-07-20 15:25:36 +02:00
Georg Ehrke e4154e6832 remove old files 2012-07-20 15:23:56 +02:00
Georg Ehrke 5575493900 Merge branch 'master' into calendar_import 2012-07-11 10:47:30 +02:00
Bjoern Schiessle ba8dee0520 introduce subclassed client.php and revert changes to 3rdparty 2012-07-06 12:26:54 +02:00
Georg Ehrke 9a10efd80f Merge branch 'master' into calendar_import 2012-07-06 11:01:12 +02:00
Bjoern Schiessle f86ecb3bf7 send ca cert path to sabredav client 2012-07-05 11:28:32 +02:00
Georg Ehrke 5880bbee8f add miniColors 2012-07-04 17:37:47 +02:00
Bjoern Schiessle ab036d4764 webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log 2012-07-02 17:52:51 +02: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 0f13cbb47d Merge branch 'master' into calendar_repeat 2012-06-20 20:14:08 +02:00
Bjoern Schiessle e52230d11c no need to escape the title 2012-06-20 15:41:05 +02:00
Georg Ehrke 229587a31e Merge branch 'master' into calendar_repeat 2012-06-17 08:36:26 +02:00
Robin Appelman 5b6229544d fix statcache for filenames containing non-alphanumeric characters in smb streamwrapper 2012-06-17 02:42:40 +02:00
Georg Ehrke 7f1e0287a9 Merge branch 'master' into calendar_repeat 2012-06-16 19:04:50 +02:00
Thomas Müller a91e3d68b0 fixing syntax error 2012-06-16 17:53:14 +02:00
Georg Ehrke a6531d0311 Merge branch 'master' into calendar_repeat 2012-06-16 09:35:53 +02:00
Robin Appelman cb833e45c2 get rid of php4 style constructors in mdb2 2012-06-15 21:59:40 +02:00
Georg Ehrke 4767c70578 fix merge conflicts 2012-06-15 11:48:26 +02:00
Bjoern Schiessle 6c7e10245c suppress warning if /dev/urandom is not readable (bug #997) 2012-06-14 12:01:16 +02:00
Georg Ehrke 7d29bee859 fix merge conflicts 2012-06-13 21:40:05 +02:00
Bart Visscher c98b56d2da CSSMin: Remove debug code 2012-06-13 21:39:12 +02:00
Michael Gapczynski bd01e93469 Add support for mounting Google Drive in external storage UI 2012-06-13 13:54:50 -04:00
Georg Ehrke f4c459782b Merge branch 'master' into calendar_repeat 2012-06-11 10:59:19 +02:00
Michael Gapczynski dd8303b975 Stop AWS SDK from looking for configuration files, forgot to include lib/cachecore 2012-06-10 16:34:44 -04:00
Georg Ehrke ef1b04619d fix merge conflicts 2012-06-10 18:38:01 +02:00
Michael Gapczynski ab41b57f62 Add Dropbox storage backend 2012-06-09 15:02:48 -04:00
Georg Ehrke 531132d64f fix a bug in when 2012-06-09 15:15:00 +02:00
Georg Ehrke 4f2993cb1d remove buggy when 2012-06-08 19:59:12 +02:00
Michael Gapczynski 8fcdccdcdc Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage 2012-06-08 13:48:38 -04:00
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
Robin Appelman d98a0a1bb9 fix for pgsql database migration 2012-05-31 00:01:49 +02:00
Georg Ehrke b14f2d0388 update When 2012-05-27 12:31:51 +02:00
Brice Maron 85dbfc8165 Correct small typo to Crypt_Blowfish 3drparty fix oc-810 2012-05-25 22:18:02 +00:00
Robin Appelman 2f40f11c87 smb filestorage backend 2012-05-24 18:23:59 +02:00
Bart Visscher ce1e4425c2 Combine and minimize core and default app js files 2012-05-16 18:53:46 +02:00
Bart Visscher f71fec8cdc Combine and minimize core and default app css files 2012-05-16 18:53:46 +02:00
Robin Appelman 8b1bc322ff remove simpletests internet test cases due to xss issues 2012-05-14 23:12:16 +02:00
Robin Appelman 6b6477a90a fix getting the db scheme from existing database 2012-05-13 21:22:08 +02:00
Robin Appelman 68fd5a5d58 some mdb2 pgsql fixes 2012-05-13 20:56:25 +02:00
Robin Appelman 77e2387d94 more MDB2 updates 2012-05-13 20:53:55 +02:00
Robin Appelman d2bd78c41a update MDB2 and XML_Parser 2012-05-11 20:33:56 +02:00
Robin Appelman 9c2f105164 update PEAR to 1.9.4 2012-05-11 17:57:55 +02:00
Bart Visscher f69f764e8b Working remote.php with webdav and caldav 2012-05-06 00:12:51 +02:00
Thomas Mueller 07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Georg Ehrke d76552a009 Merge branch 'sabredav_1.6' 2012-04-25 10:39:31 +02:00
Frank Karlitschek 9b134b0636 move granite also to apps-playground because it´s not stable yet and is no longer used 2012-04-24 15:41:54 +02:00
Georg Ehrke 44fa4433bc move files of fullcalendar 1.5.3 2012-04-22 21:18:40 +02:00
Georg Ehrke c77fa42143 add new files of fullcalendar 1.5.3 2012-04-22 21:18:40 +02:00
Georg Ehrke 43ee5cf224 remove old fullcalendar files 2012-04-22 21:18:40 +02:00