Michael Gapczynski
|
702c27b0e6
|
Merge branch 'master' into external_storage_ui_feedback
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
|
2013-02-19 19:12:14 -05:00 |
Björn Schießle
|
4a3374ecf8
|
fix redirect, use the new routing
|
2013-02-18 14:38:29 +01:00 |
Bart Visscher
|
5c4a804ddb
|
Fix SpaceBeforeOpenBrace errors
|
2013-02-14 08:36:26 +01:00 |
Thomas Mueller
|
a814361ca7
|
Merge branch 'master' into external_storage_ui_feedback
|
2013-02-12 23:01:54 +01:00 |
Lukas Reschke
|
a9c77ebaf8
|
Check requesttoken
|
2013-02-12 11:35:16 +01:00 |
|
Thomas Mueller
|
a953786d79
|
Merge branch 'master' into external_storage_ui_feedback
|
2013-02-12 11:01:14 +01:00 |
|
Michael Gapczynski
|
6eba790a75
|
Merge branch 'master' into external_storage_ui_feedback
Conflicts:
apps/files_external/js/dropbox.js
apps/files_external/js/google.js
apps/files_external/js/settings.js
apps/files_external/lib/amazons3.php
apps/files_external/lib/dropbox.php
apps/files_external/lib/google.php
apps/files_external/lib/smb.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
lib/filestorage.php
|
2013-02-11 20:27:05 -05:00 |
|
Thomas Mueller
|
f512dea3be
|
[files_external] fixing some undefined index
|
2013-02-11 15:45:10 +01:00 |
|
Michael Gapczynski
|
0dbf1d0260
|
Show status icons for mount points in external storage UI
|
2012-12-24 13:45:52 -05:00 |
Robin Appelman
|
be30b1a8de
|
merge master into filesystem
|
2012-12-03 18:02:22 +01:00 |
Jörn Friedrich Dreyer
|
92df70b6e5
|
fix checkstyle for files_external app, add whitespace for readability
|
2012-11-30 16:27:11 +01:00 |
|
Robin Appelman
|
77cef5f514
|
merge master into filesystem
|
2012-10-17 13:14:17 +02:00 |
|
Bart Visscher
|
4af5b016cc
|
Whitespace cleanup
|
2012-10-14 21:04:08 +02:00 |
|
Robin Appelman
|
aaa1b73364
|
don't use depricated OC_Filesystem
|
2012-10-10 13:18:36 +02:00 |
|
Björn Schießle
|
aa9ffd119a
|
check if file really exist before add/remove it
|
2012-09-27 12:37:23 +02:00 |
|
Björn Schießle
|
a56f2ec183
|
only upload valid ssl root certificates
|
2012-09-27 11:21:29 +02:00 |
|
Björn Schießle
|
21c6cc45e6
|
take '\' on windows systems into account to prevent file deletion above upload direectory
|
2012-09-26 23:08:40 +02:00 |
|
Björn Schießle
|
9ab887fed5
|
fix security issue, don't allow to go back in the path
|
2012-09-26 21:35:14 +02:00 |
|
Björn Schießle
|
842cd57fa7
|
use more oc file operations instead of plain PHP functions
|
2012-09-18 17:04:22 +02:00 |
|
Bart Visscher
|
0365f8fd01
|
Remove php close at end of file
|
2012-08-29 20:29:43 +02:00 |
|
Bart Visscher
|
0e58800016
|
Whitespace fixes in apps
|
2012-08-29 20:29:43 +02:00 |
|
Lukas Reschke
|
2dfc485149
|
XSRF checks
|
2012-08-10 00:44:35 +02:00 |
|
Bjoern Schiessle
|
43f00a2dc8
|
create uploads directory for ssl certificates if it didn't exists
|
2012-07-09 18:11:29 +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 |
|
Lukas Reschke
|
ea70ca3ce3
|
CSRF checks
|
2012-07-07 16:12:21 +02:00 |
|
Bjoern Schiessle
|
ca26bcc581
|
close file after write process
|
2012-07-06 17:09:20 +02:00 |
|
Bjoern Schiessle
|
e91b4bc2ac
|
allow user to upload his own root certificate for secure webdav mount
|
2012-07-06 15:58:38 +02:00 |
|
Bjoern Schiessle
|
5d61b85a1d
|
allow users to upload ssl root certificates for the webdav client
|
2012-07-04 17:18:36 +02:00 |
Michael Gapczynski
|
bd01e93469
|
Add support for mounting Google Drive in external storage UI
|
2012-06-13 13:54:50 -04:00 |
|
Michael Gapczynski
|
5f80be7664
|
Add support for mounting Dropbox in external storage UI
|
2012-06-12 11:36:43 -04:00 |
|
Michael Gapczynski
|
4b3ae60558
|
Working UI for external storage mount configuration
|
2012-06-08 11:42:29 -04:00 |