4767c70578
fix merge conflicts
2012-06-15 11:48:26 +02:00
b0420ee8be
suppress warning if /dev/urandom is not readable (bug #997 )
2012-06-14 13:18:50 +02:00
6c7e10245c
suppress warning if /dev/urandom is not readable (bug #997 )
2012-06-14 12:01:16 +02:00
7d29bee859
fix merge conflicts
2012-06-13 21:40:05 +02:00
c98b56d2da
CSSMin: Remove debug code
2012-06-13 21:39:12 +02:00
bd01e93469
Add support for mounting Google Drive in external storage UI
2012-06-13 13:54:50 -04:00
f4c459782b
Merge branch 'master' into calendar_repeat
2012-06-11 10:59:19 +02:00
dd8303b975
Stop AWS SDK from looking for configuration files, forgot to include lib/cachecore
2012-06-10 16:34:44 -04:00
ef1b04619d
fix merge conflicts
2012-06-10 18:38:01 +02:00
ab41b57f62
Add Dropbox storage backend
2012-06-09 15:02:48 -04:00
531132d64f
fix a bug in when
2012-06-09 15:15:00 +02:00
4f2993cb1d
remove buggy when
2012-06-08 19:59:12 +02:00
8fcdccdcdc
Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage
2012-06-08 13:48:38 -04:00
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
d98a0a1bb9
fix for pgsql database migration
2012-05-31 00:01:49 +02:00
f4577bf00c
fix for pgsql database migration
2012-05-31 00:01:03 +02:00
b14f2d0388
update When
2012-05-27 12:31:51 +02:00
85dbfc8165
Correct small typo to Crypt_Blowfish 3drparty fix oc-810
2012-05-25 22:18:02 +00:00
2f40f11c87
smb filestorage backend
2012-05-24 18:23:59 +02:00
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
8b1bc322ff
remove simpletests internet test cases due to xss issues
2012-05-14 23:12:16 +02:00
6b6477a90a
fix getting the db scheme from existing database
2012-05-13 21:22:08 +02:00
68fd5a5d58
some mdb2 pgsql fixes
2012-05-13 20:56:25 +02:00
77e2387d94
more MDB2 updates
2012-05-13 20:53:55 +02:00
d2bd78c41a
update MDB2 and XML_Parser
2012-05-11 20:33:56 +02:00
9c2f105164
update PEAR to 1.9.4
2012-05-11 17:57:55 +02:00
f69f764e8b
Working remote.php with webdav and caldav
2012-05-06 00:12:51 +02:00
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
d76552a009
Merge branch 'sabredav_1.6'
2012-04-25 10:39:31 +02:00
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
44fa4433bc
move files of fullcalendar 1.5.3
2012-04-22 21:18:40 +02:00
c77fa42143
add new files of fullcalendar 1.5.3
2012-04-22 21:18:40 +02:00
43ee5cf224
remove old fullcalendar files
2012-04-22 21:18:40 +02:00
e2f64394f3
update to SabreDav 1.6.2
2012-04-21 23:24:39 +02:00
a0a80e74c2
remove old sabredav files
2012-04-21 23:23:46 +02:00
c3cb000cb2
add phpmailer to 3rdparty
2012-04-20 20:53:36 +02:00
9a707e10bf
add SWIFT (openstack object storage) storage backend
2012-04-18 20:54:28 +02:00
8cea656ad7
upgrade getid3
2012-04-12 15:54:08 +02:00
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
1b6fe4f65e
stricter tests for archive backends and make sure we make the tests
2012-03-28 23:47:44 +02:00
c26e003462
add tar backend for OC_Archive
...
also handles bz2/gz compression
2012-03-28 23:47:44 +02:00
62cd89da14
improved password hashing based one phpass
...
old passwords are automatically upgraded on login
2012-02-26 14:12:50 +01:00
4f627c428e
some more error reporting during filesystem scan
2012-02-25 20:27:16 +01:00
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
dccdeca258
remove the 3rdparty files. everything is now in https://gitorious.org/owncloud/3rdparty
2012-02-15 20:40:37 +01:00
4cc3a3096a
Server verhindert beim OSX Client einen Delete
2012-02-13 23:48:22 +01:00
3579446930
use SimpleTest for unit testing
...
includes some tests for storage providers, more to come
2012-02-12 18:07:58 +01:00
6e86b34586
Merge branch 'master' into calendar
2012-01-17 15:57:29 +01:00
2179437726
use timepicker to force users to use HH:MM
2012-01-16 20:22:54 +01:00
757e6cd0aa
typos....
2012-01-16 02:22:23 +01:00
011732a083
small documentation improvement
2012-01-16 02:20:29 +01:00
ebe10870cf
fix database upgrading for pgsql
2012-01-16 02:06:19 +01:00
da33229dab
fix some pgsql strict warnings
2012-01-16 01:11:58 +01:00
469a80ac09
fix some sqlite2 upgrade issues
2012-01-14 18:11:32 +01:00
5c179e6255
fix another warning in pgsql
2012-01-14 18:11:32 +01:00
1b1c4889fc
fix some warning in the pgsql driver
2012-01-13 20:04:59 +01:00
9e105d9bd7
remove old code in comments
2012-01-08 16:44:15 +01:00
a9aabd1c8d
3rdparty: fix bug in when
2012-01-08 16:41:36 +01:00
be9ca44d07
fix bug in 3rdparty lib
2012-01-05 20:19:07 +01:00
3d1accab70
add licence file for sabredav
2011-12-18 03:45:13 +01:00
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
cea6561632
Update chosen to v0.9.5
2011-11-24 21:36:34 +01:00
a303992d78
support for repeating events
2011-11-12 22:02:04 +01:00
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
5ffec92701
upgrade to Sabredav 1.5.4
2011-10-29 00:50:07 +02:00
a12cdb55b1
Replace ownCloud calendar html with fullcalendar implementation
2011-10-20 23:49:27 +02:00
213275a1f8
Add translation and fixed some css problems
2011-10-02 15:55:23 +02:00
98fad5de92
Reapply fix by Florian Pritz: change DATETIME to DATE-TIME in vcards
...
The rfc [1] only mentions "DATE-TIME" and after this change events
created in the web ui can be imported by lightning. Before it threw a
syntax error.
[1]: https://tools.ietf.org/html/rfc5545
Signed-off-by: Florian Pritz <bluewind@xinu.at>
From commit 71706282f7
2011-09-29 22:07:50 +02:00
2086bc4be7
update sabredav to 1.5.3
2011-09-29 14:28:57 +02:00
71706282f7
change DATETIME to DATE-TIME in vcards
...
The rfc [1] only mentions "DATE-TIME" and after this change events
created in the web ui can be imported by lightning. Before it threw a
syntax error.
[1]: https://tools.ietf.org/html/rfc5545
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:52 +02:00
8648e3c43c
only call error_log() if DEBUG is true
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:47 +02:00
f65d0e4f80
moved copyright and license notices in one place
2011-09-24 16:30:11 +02:00
82c7598861
Remove global vars and use the OC static version.
...
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
e1bde1a78e
Merge branch 'master' into sharing
...
Conflicts:
files/templates/index.php
2011-08-10 13:40:47 -04:00
f633492dfc
Update SabreDAV
2011-08-10 14:39:12 +02:00
ec6aed8475
Merge branch 'master' into sharing
2011-08-09 10:42:50 -04:00
9a8eb7298c
Actually add the chosen plugin
2011-08-09 10:40:01 -04:00
1419d7f2b0
remove prototype versions of chosen
2011-08-09 16:31:16 +02:00
88e2b3a857
initial work on new user management
2011-08-09 15:29:13 +02:00
f5a030f4ae
remove the ownCloud 3D support and add lot's of usefull 3rd party libraries instead.
2011-08-07 17:36:49 +02:00
Georg Ehrke
Bjoern Schiessle
Bart Visscher
Michael Gapczynski
Robin Appelman
Brice Maron
Thomas Mueller
Frank Karlitschek
Steven
Robin Appelman
Georg Ehrke
Marvin Thomas Rabe
Florian Pritz
Jan-Christoph Borchardt
Bart Visscher
Jakob Sack