diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-11-23 00:40:58 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-11-23 00:40:58 +0100 |
| commit | 95057e727d438098bec050baf997a7489563a04e (patch) | |
| tree | 9c3dd5dfc543d7726c8f68b4cf041ad24c7fe7b8 /apps/files/js/files.js | |
| parent | 8fb4dfd2eabcc267725d3c151d93644d6f28f010 (diff) | |
| parent | 3688376a6f0d2e1ba0a98345aba0d7b82940db4a (diff) | |
| download | nextcloud-server-95057e727d438098bec050baf997a7489563a04e.tar.gz nextcloud-server-95057e727d438098bec050baf997a7489563a04e.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index f95bfa2bf8f..4307650d4ff 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -509,6 +509,10 @@ $(document).ready(function() { $('#notification').text(t('files','Invalid name, \'/\' is not allowed.')); $('#notification').fadeIn(); return; + } else if( type == 'folder' && $('#dir').val() == '/' && $(this).val() == 'Shared') { + $('#notification').text(t('files','Invalid folder name. Usage of "Shared" is reserved by Owncloud')); + $('#notification').fadeIn(); + return; } var name = getUniqueName($(this).val()); if (name != $(this).val()) { |