diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-28 09:57:24 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-28 09:57:24 +0100 |
| commit | 1d44a99ebb5f00b3b9550f4c281db7519cec3c75 (patch) | |
| tree | 43a6ab3a67421bbf6589f757a97088eb16dff08b /apps/files_sharing | |
| parent | dbc13cf6ee775745c86f92d97d636f9ed3cf5432 (diff) | |
| parent | 31d83fddc482959d7fb4f7377cc7020c59c30951 (diff) | |
| download | nextcloud-server-1d44a99ebb5f00b3b9550f4c281db7519cec3c75.tar.gz nextcloud-server-1d44a99ebb5f00b3b9550f4c281db7519cec3c75.zip | |
Merge branch 'master' into updater-CSP
Conflicts:
core/templates/update.php
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/js/share.js | 2 | ||||
| -rw-r--r-- | apps/files_sharing/l10n/lb.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 780b9c1bf6d..eb5a6e8cb7f 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -1,5 +1,7 @@ $(document).ready(function() { + var disableSharing = $('#disableSharing').data('status'); + if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) { FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) { diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php new file mode 100644 index 00000000000..8aba5806aa0 --- /dev/null +++ b/apps/files_sharing/l10n/lb.php @@ -0,0 +1,3 @@ +<?php $TRANSLATIONS = array( +"Password" => "Passwuert" +); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 275360ac2a8..35cca7c42dc 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -1,5 +1,3 @@ -<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('publicListView');?>"></script> - <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir"> <input type="hidden" name="downloadURL" value="<?php echo $_['downloadURL'] ?>" id="downloadURL"> <input type="hidden" name="filename" value="<?php echo $_['filename'] ?>" id="filename"> |