summaryrefslogtreecommitdiffstats
path: root/settings/js/admin.js
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2014-06-05 22:54:27 +0200
committerGeorg Ehrke <developer@georgehrke.com>2014-06-05 22:54:27 +0200
commit0fe8f77c1748d167e115680346ae98bba78da38d (patch)
treea456ff35bb2da1a2778f18ccab1ade63e9aaddda /settings/js/admin.js
parentfad3bd7fc0c094bd16e07708557cd1a7676889cd (diff)
parente1beb8c6c38d48eb923ed323dea25110e4bbacfd (diff)
downloadnextcloud-server-0fe8f77c1748d167e115680346ae98bba78da38d.tar.gz
nextcloud-server-0fe8f77c1748d167e115680346ae98bba78da38d.zip
Merge branch 'master' into update_shipped_apps_from_appstore
Conflicts: lib/private/app.php settings/templates/apps.php
Diffstat (limited to 'settings/js/admin.js')
-rw-r--r--settings/js/admin.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js
index bc95c6a3dc5..8c7572fa394 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -83,6 +83,9 @@ $(document).ready(function(){
$('#allowLinks').change(function() {
$("#publicLinkSettings").toggleClass('hidden', !this.checked);
});
+ $('#allowResharing').change(function() {
+ $("#resharingSettings").toggleClass('hidden', !this.checked);
+ });
$('#security').change(function(){
$.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} );