diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-23 13:45:27 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-23 13:45:27 -0700 |
| commit | 535bc7b6641eb56eae7ec8a5fd20ad092ed05f44 (patch) | |
| tree | 4776bdbf7a994593920c611830d99e0fe5af9a6c /core | |
| parent | 291cdbdd989a50b17013396662241828ce691cb6 (diff) | |
| parent | 4991a7bd06e226850391cf9aef6fa6daaee57a9d (diff) | |
| download | nextcloud-server-535bc7b6641eb56eae7ec8a5fd20ad092ed05f44.tar.gz nextcloud-server-535bc7b6641eb56eae7ec8a5fd20ad092ed05f44.zip | |
Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename
prevent user from creating or renaming sth. to an existing filename
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/js.js | 2 | ||||
| -rw-r--r-- | core/js/octemplate.js | 2 | ||||
| -rw-r--r-- | core/templates/message.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js index c17e3fa2959..f5991cfc9dd 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -933,7 +933,7 @@ jQuery.fn.selectRange = function(start, end) { */ jQuery.fn.exists = function(){ return this.length > 0; -} +}; /** * Calls the server periodically every 15 mins to ensure that session doesnt diff --git a/core/js/octemplate.js b/core/js/octemplate.js index 46ffa976574..aab705059d2 100644 --- a/core/js/octemplate.js +++ b/core/js/octemplate.js @@ -82,7 +82,7 @@ } ); } catch(e) { - console.error(e, 'data:', data) + console.error(e, 'data:', data); } }, options: { diff --git a/core/templates/message.html b/core/templates/message.html index 59048100f32..cd642231a9e 100644 --- a/core/templates/message.html +++ b/core/templates/message.html @@ -1,3 +1,3 @@ -<div id="{dialog_name}" title="{title}"> +<div id="{dialog_name}" title="{title} "><!-- the ' ' after {title} fixes ie8, see http://stackoverflow.com/a/5313137/828717 --> <p><span class="ui-icon ui-icon-{type}"></span>{message}</p> </div> |