2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
6ac85480f7
replace last personalblock fieldset within files_external
2014-03-31 13:00:46 +02:00
e806b6d9a0
Merge pull request #7842 from Xenopathic/files_external_config_optional
...
Enable the use of 'optional' on password fields for mount configuration
2014-03-28 10:02:28 +00:00
6de572c6e6
replace personalblock fieldset with section class in files apps
2014-03-27 17:00:47 +01:00
e002b7242c
Fix merging of external storage configurations
...
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.
Fixed merging logic to make sure that class, mount point and options are
the same before merging them.
Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
2014-03-26 12:41:25 +01:00
7a0eccfc63
Correct field modifier checking
...
Existing code checks for the existence of a modifier ('&', '!', '#', '*')
anywhere in the field name, but strips the first character regardless. This
change makes it so that only modifiers at the beginning of the string are
counted.
2014-03-20 18:28:42 +00:00
ed0c10a10b
Enable the use of 'optional' on password fields
...
The logic has been changed, in that 'class="optional"' is applied to both
password and text types if the field begins with the optional market, '&'.
2014-03-20 18:27:40 +00:00
932c4ee927
Allow admins to disable certain external storages for users
...
Fix issue #6793
2014-02-26 15:02:41 +01:00
d6121464a0
Fixed placeholder after page reload
...
The placeholder somehow had too many characters stripping from it...
2013-12-03 12:26:08 +01:00
b8285ca316
Added missing "grid" class on external storage's table
2013-10-14 14:02:39 +02:00
2b521327c0
more elegant style for Personal and Admin settings
2013-10-05 11:23:49 +02:00
599778b153
Files External: show display names instead of internal user names in Settings UI
2013-03-27 19:07:33 +01:00
ec45a8433d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/templates/settings.php
2013-03-15 17:50:02 +01:00
d2b3a9fb3b
Update settings.php
...
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
2013-03-15 15:09:55 +01:00
d3e88e6a8c
Remove uneeded sanitizeHTML
2013-03-02 12:44:53 +01:00
236507a19f
[files_external] From echo to p
2013-02-27 21:31:27 +01:00
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
79284b8e57
Sanitize HTML
2013-02-18 08:11:59 +01:00
4708d4549d
Add missing requesttoken
...
This is a trivial fix for a regression caused by #1648
2013-02-16 13:28:49 +01:00
a953786d79
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 11:01:14 +01:00
ad6e133ca6
Replace another mount point placeholder
2013-02-11 20:35:40 -05:00
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
6f08b1f829
Change wordings
2013-02-11 18:04:54 -05:00
7776d047b2
[files_external] fix config gui for all users
...
backport of 9e05781ec2
2013-02-11 15:49:49 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
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
0dbf1d0260
Show status icons for mount points in external storage UI
2012-12-24 13:45:52 -05:00
30b0e8b70c
cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)
2012-12-15 20:02:16 +01:00
f3bd6d14ee
add some output why some of the external filesystems might not work
2012-12-10 21:10:28 +01:00
92df70b6e5
fix checkstyle for files_external app, add whitespace for readability
2012-11-30 16:27:11 +01:00
90a1bd5721
seperate the form to set up the mount points and the form to upload ssl certificates
2012-09-25 12:01:09 +02:00
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
830676b475
Improve usability for configuring Dropbox and Google Drive external storage
2012-08-13 17:10:58 -04:00
77f07c672e
remove hard coded path
2012-07-09 12:49:04 +02:00
6bf1473f0e
replace urlencoded slash
2012-07-09 11:58:16 +02:00
e91b4bc2ac
allow user to upload his own root certificate for secure webdav mount
2012-07-06 15:58:38 +02:00
aa3b575ceb
disabled user upload of root certificates until sabredav client can handle them
2012-07-05 11:31:30 +02:00
e258da5c3c
certificate should be only visible for users
2012-07-04 17:22:04 +02:00
5d61b85a1d
allow users to upload ssl root certificates for the webdav client
2012-07-04 17:18:36 +02:00
edc6a648d1
Fix placeholder value for optional fields in external storage UI
2012-06-29 19:35:57 -04:00
f311c2a2ff
Hide the delete button on new mount point row
2012-06-29 11:10:51 -04:00
31bba86e87
Fix external storage UI for Admin page
2012-06-28 17:55:22 -04:00
b5889d6ffe
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
5f80be7664
Add support for mounting Dropbox in external storage UI
2012-06-12 11:36:43 -04:00
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
27d1c1bb94
Sanitize user input
2012-06-11 00:14:28 +02:00
4b3ae60558
Working UI for external storage mount configuration
2012-06-08 11:42:29 -04:00
bee724c53e
Initial work on UI for mounting external storage
2012-05-24 11:06:03 -04:00
Jan-Christoph Borchardt
Robin McCorkell
Vincent Petry
Joas Schilling
Arthur Schiwon
sherbrecher
Lukas Reschke
Michael Gapczynski
Thomas Mueller
Bart Visscher
Frank Karlitschek
Jörn Friedrich Dreyer
Björn Schießle
Michael Gapczynski