Commit Graph

66 Commits

Author SHA1 Message Date
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
Georg Ehrke e2f64394f3 update to SabreDav 1.6.2 2012-04-21 23:24:39 +02:00
Georg Ehrke a0a80e74c2 remove old sabredav files 2012-04-21 23:23:46 +02:00
Frank Karlitschek c3cb000cb2 add phpmailer to 3rdparty 2012-04-20 20:53:36 +02:00
Robin Appelman 9a707e10bf add SWIFT (openstack object storage) storage backend 2012-04-18 20:54:28 +02:00
Robin Appelman 8cea656ad7 upgrade getid3 2012-04-12 15:54:08 +02:00
Frank Karlitschek b0894b3148 Add Craigs granite library to 3rdparty and files_versioning. Still not working and lots ot stuff to do. 2012-04-09 22:10:29 +02:00
Robin Appelman 1b6fe4f65e stricter tests for archive backends and make sure we make the tests 2012-03-28 23:47:44 +02:00
Robin Appelman c26e003462 add tar backend for OC_Archive
also handles bz2/gz compression
2012-03-28 23:47:44 +02:00
Robin Appelman 62cd89da14 improved password hashing based one phpass
old passwords are automatically upgraded on login
2012-02-26 14:12:50 +01:00
Robin Appelman 4f627c428e some more error reporting during filesystem scan 2012-02-25 20:27:16 +01:00
Robin Appelman 20553c1afe Revert "remove the 3rdparty files. everything is now in https://gitorious.org/owncloud/3rdparty"
This reverts commit dccdeca258.
2012-02-16 09:44:49 +01:00
Frank Karlitschek dccdeca258 remove the 3rdparty files. everything is now in https://gitorious.org/owncloud/3rdparty 2012-02-15 20:40:37 +01:00
Robin Appelman 3579446930 use SimpleTest for unit testing
includes some tests for storage providers, more to come
2012-02-12 18:07:58 +01:00
Georg Ehrke 6e86b34586 Merge branch 'master' into calendar 2012-01-17 15:57:29 +01:00
Georg Ehrke 2179437726 use timepicker to force users to use HH:MM 2012-01-16 20:22:54 +01:00
Robin Appelman 757e6cd0aa typos.... 2012-01-16 02:22:23 +01:00
Robin Appelman 011732a083 small documentation improvement 2012-01-16 02:20:29 +01:00
Robin Appelman ebe10870cf fix database upgrading for pgsql 2012-01-16 02:06:19 +01:00
Robin Appelman da33229dab fix some pgsql strict warnings 2012-01-16 01:11:58 +01:00
Robin Appelman 469a80ac09 fix some sqlite2 upgrade issues 2012-01-14 18:11:32 +01:00
Robin Appelman 5c179e6255 fix another warning in pgsql 2012-01-14 18:11:32 +01:00
Robin Appelman 1b1c4889fc fix some warning in the pgsql driver 2012-01-13 20:04:59 +01:00
Georg Ehrke 9e105d9bd7 remove old code in comments 2012-01-08 16:44:15 +01:00
Georg Ehrke a9aabd1c8d 3rdparty: fix bug in when 2012-01-08 16:41:36 +01:00
Georg Ehrke be9ca44d07 fix bug in 3rdparty lib 2012-01-05 20:19:07 +01:00
Robin Appelman 3d1accab70 add licence file for sabredav 2011-12-18 03:45:13 +01:00
Bart Visscher 2d391298fb Contacts: Allow '/' in property name
Kaddressbook uses this in the messaging property. This is allowed in Version 2 of the vcard specification. Version 3 of the specification doesn't allow this any more but be lenient in what we accept.
2011-11-30 20:58:27 +01:00
Bart Visscher cea6561632 Update chosen to v0.9.5 2011-11-24 21:36:34 +01:00
Georg Ehrke a303992d78 support for repeating events 2011-11-12 22:02:04 +01:00
Georg Ehrke e5a3ab8aad Merge branch 'master' into fullcalendar 2011-11-12 15:09:37 +01:00