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
|
b1da1db0eb
|
Merge branch 'master' into from_live_to_on
Conflicts:
apps/files_external/js/google.js
|
2013-01-31 23:34:12 +01:00 |
Jörn Friedrich Dreyer
|
22812c5f0d
|
replace live() with on() in core js
|
2013-01-30 17:00:54 +01:00 |
|
Michael Gapczynski
|
e666ce3622
|
Fix external storage UI for new storage namespaces
|
2013-01-21 23:57:26 -05:00 |
|
Michael Gapczynski
|
78043d73e8
|
Set status to waiting for Dropbox and Google Drive while authenticating
|
2013-01-09 21:47:24 -05:00 |
|
Michael Gapczynski
|
d65cb7ae09
|
Fix 'Grant Access' button for multiple Google Drive mount points and prevent multiple scripts being added
|
2013-01-02 11:59:17 -05:00 |
|
Michael Gapczynski
|
a69de3a8f1
|
Turn off async for saving mount points, improve input detection for Google and Dropbox 'Grant Access' buttons
|
2013-01-01 16:19:40 -05:00 |
|
Michael Gapczynski
|
3c08d2ba23
|
Change callback url to path only in case oauth parameters are still in url
|
2012-12-24 13:48:18 -05:00 |
|
Thomas Mueller
|
7abe1360b2
|
l18n support added to files_external/js
|
2012-10-02 23:09:28 +02:00 |
|
Michael Gapczynski
|
830676b475
|
Improve usability for configuring Dropbox and Google Drive external storage
|
2012-08-13 17:10:58 -04:00 |
|
Michael Gapczynski
|
7f12a65c24
|
Show access granted label immediately after granting access
|
2012-08-13 17:10:58 -04:00 |
|
Michael Gapczynski
|
b6b2f8826b
|
Show access granted label next to Google Drive and Dropbox storage in configuration
|
2012-08-13 17:10:58 -04:00 |
|
Michael Gapczynski
|
7e9455c382
|
Allow multiple Google Drive and Dropbox external storages to be configured
|
2012-06-29 11:22:54 -04:00 |
Michael Gapczynski
|
b650f46698
|
Fix variable checks for mounting Google Drive
|
2012-06-22 12:22:42 -04:00 |
|
Michael Gapczynski
|
bd01e93469
|
Add support for mounting Google Drive in external storage UI
|
2012-06-13 13:54:50 -04:00 |