summaryrefslogtreecommitdiffstats
path: root/apps/files_external/templates
Commit message (Collapse)AuthorAgeFilesLines
* Fix merging of external storage configurationsVincent Petry2014-03-261-7/+7
| | | | | | | | | | | | | 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.
* Allow admins to disable certain external storages for usersJoas Schilling2014-02-261-6/+12
| | | | Fix issue #6793
* Fixed placeholder after page reloadVincent Petry2013-12-031-1/+1
| | | | The placeholder somehow had too many characters stripping from it...
* Added missing "grid" class on external storage's tableVincent Petry2013-10-141-1/+1
|
* more elegant style for Personal and Admin settingsJan-Christoph Borchardt2013-10-051-2/+2
|
* Files External: show display names instead of internal user names in Settings UIArthur Schiwon2013-03-271-1/+1
|
* Merge remote-tracking branch 'upstream/master'sherbrecher2013-03-151-57/+103
|\ | | | | | | | | Conflicts: apps/files_external/templates/settings.php
| * Remove uneeded sanitizeHTMLLukas Reschke2013-03-021-1/+1
| |
| * [files_external] From echo to pLukas Reschke2013-02-271-54/+54
| |
| * Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-191-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/js/settings.js apps/files_external/lib/smb.php apps/files_external/templates/settings.php lib/files/storage/common.php
| | * Sanitize HTMLLukas Reschke2013-02-181-1/+1
| | |
| | * Add missing requesttokenLukas Reschke2013-02-161-0/+1
| | | | | | | | | | | | This is a trivial fix for a regression caused by #1648
| * | Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-121-1/+1
| |\|
| | * [files_external] fix config gui for all usersThomas Mueller2013-02-111-1/+1
| | | | | | | | | | | | backport of 9e05781ec22c3f4e6b89b188332242b03088736e
| * | Replace another mount point placeholderMichael Gapczynski2013-02-111-1/+1
| | |
| * | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-111-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Whitespace cleanupBart Visscher2013-01-161-2/+2
| | |
| | * Spaces to tabsBart Visscher2013-01-161-1/+1
| | |
| * | Change wordingsMichael Gapczynski2013-02-111-3/+3
| | |
| * | Fix 'Grant Access' button for multiple Google Drive mount points and prevent ↵Michael Gapczynski2013-01-021-3/+2
| | | | | | | | | | | | multiple scripts being added
| * | Show status icons for mount points in external storage UIMichael Gapczynski2012-12-241-0/+6
| |/
| * cleaning up the settings. standardize the format, add missing I10N and other ↵Frank Karlitschek2012-12-151-8/+3
| | | | | | | | small things. Yes. This is not perfect. But way better than before ;-)
| * add some output why some of the external filesystems might not workFrank Karlitschek2012-12-101-1/+2
| |
| * fix checkstyle for files_external app, add whitespace for readabilityJörn Friedrich Dreyer2012-11-301-32/+76
| |
* | Update settings.phpsherbrecher2013-03-151-2/+2
|/ | | | fixed overlap of input controls (root cert import) see issue: https://github.com/owncloud/apps/issues/767
* seperate the form to set up the mount points and the form to upload ssl ↵Björn Schießle2012-09-251-11/+15
| | | | certificates
* Space before tab fixesBart Visscher2012-08-291-1/+1
|
* Whitespace fixes in appsBart Visscher2012-08-291-5/+5
|
* Improve usability for configuring Dropbox and Google Drive external storageMichael Gapczynski2012-08-131-1/+1
|
* remove hard coded pathBjoern Schiessle2012-07-091-1/+1
|
* replace urlencoded slashBjoern Schiessle2012-07-091-1/+1
|
* allow user to upload his own root certificate for secure webdav mountBjoern Schiessle2012-07-061-1/+1
|
* disabled user upload of root certificates until sabredav client can handle themBjoern Schiessle2012-07-051-1/+1
|
* certificate should be only visible for usersBjoern Schiessle2012-07-041-0/+2
|
* allow users to upload ssl root certificates for the webdav clientBjoern Schiessle2012-07-041-2/+23
|
* Fix placeholder value for optional fields in external storage UIMichael Gapczynski2012-06-291-1/+1
|
* Hide the delete button on new mount point rowMichael Gapczynski2012-06-291-1/+1
|
* Fix external storage UI for Admin pageMichael Gapczynski2012-06-281-1/+1
|
* Merge commit 'refs/merge-requests/127' of ↵Michael Gapczynski2012-06-131-1/+1
|\ | | | | | | | | | | | | | | git://gitorious.org/owncloud/owncloud into merge-requests/127 Conflicts: apps/files_external/templates/settings.php lib/template.php
| * Removed some unessecary sanitizationsLukas Reschke2012-06-111-4/+4
| |
* | Add support for mounting Dropbox in external storage UIMichael Gapczynski2012-06-121-3/+6
|/
* Sanitize user inputLukas Reschke2012-06-111-4/+4
|
* Working UI for external storage mount configurationMichael Gapczynski2012-06-081-41/+53
|
* Initial work on UI for mounting external storageMichael Gapczynski2012-05-241-0/+74