aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/fileactions.js
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-09-28 15:38:49 +0200
committerBart Visscher <bartv@thisnet.nl>2012-09-28 15:38:49 +0200
commitbf1057143cdff8ec289d9d766ab100d64d7ea45d (patch)
tree6c35d0d99a72f27a981a07c93f0ecbf600764cd4 /apps/files/js/fileactions.js
parent3efe1d3b24e65ed76d521c24b0cfe4e0ff2e7af5 (diff)
parent5144d26088b98685a37c73c776a9a47203efa68a (diff)
downloadnextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.tar.gz
nextcloud-server-bf1057143cdff8ec289d9d766ab100d64d7ea45d.zip
Merge branch 'master' into routing
Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php
Diffstat (limited to 'apps/files/js/fileactions.js')
-rw-r--r--apps/files/js/fileactions.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 37e6c91ebe5..ba80c3043b8 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -179,6 +179,7 @@ FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.
$('.tipsy').remove();
});
+// t('files', 'Rename')
FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename');},function(filename){
FileList.rename(filename);
});