Michael Gapczynski
|
30b58f5677
|
Merge branch 'master' into share_api
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
|
2012-07-25 17:08:18 -04:00 |
Robin Appelman
|
c9be9ab251
|
remove unused variables
|
2012-07-20 18:56:18 +02:00 |
Jörn Friedrich Dreyer
|
e59a1806cf
|
remove superfluous ?> at the end of .php files (left out apps/*/templates)
|
2012-07-09 16:51:16 +02:00 |
|
Robin Appelman
|
4768510923
|
split share and root config for smb backend, also sanitize config a bit more
|
2012-06-08 01:29:55 +02:00 |
Michael Gapczynski
|
d334f33eba
|
Initial support for Amazon S3 storage backend
Conflicts:
apps/files_external/tests/config.php
|
2012-05-29 12:19:29 -04:00 |
|
Robin Appelman
|
2f40f11c87
|
smb filestorage backend
|
2012-05-24 18:23:59 +02:00 |
Thomas Mueller
|
583dce5276
|
removing executable bit - again
|
2012-05-15 00:52:00 +02:00 |
|
Robin Appelman
|
0b51c53443
|
run none of the extranal storage tests on default
|
2012-05-02 23:44:00 +02:00 |
Frank Karlitschek
|
8c7f854671
|
move all the files stuff into a files class
|
2012-05-02 12:54:31 +02:00 |
|
Frank Karlitschek
|
93b63cf375
|
ported the rest of the OC_Helper calls
|
2012-05-02 00:20:45 +02:00 |
|
Robin Appelman
|
9a707e10bf
|
add SWIFT (openstack object storage) storage backend
|
2012-04-18 20:54:28 +02:00 |
|
Robin Appelman
|
6066ea3170
|
only run tests for files_external when asked for explicitly
|
2012-04-13 18:49:50 +02:00 |
Jan-Christoph Borchardt
|
011132feb3
|
renaming remote storage support to External storage support to clear up naming conflict
|
2012-03-30 18:18:37 +02:00 |