diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/.l10nignore | 4 | ||||
-rw-r--r-- | core/Controller/CssController.php | 1 | ||||
-rw-r--r-- | core/Controller/JsController.php | 1 | ||||
-rw-r--r-- | core/Controller/SvgController.php | 2 | ||||
-rw-r--r-- | core/js/sharedialoglinkshareview.js | 6 |
5 files changed, 11 insertions, 3 deletions
diff --git a/core/.l10nignore b/core/.l10nignore new file mode 100644 index 00000000000..cfd59b5cb73 --- /dev/null +++ b/core/.l10nignore @@ -0,0 +1,4 @@ +# compiled vue templates +js/contactsmenu_templates.js +js/sharetemplates.js +js/systemtags/templates.js diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php index c8458eab29c..901074d0285 100644 --- a/core/Controller/CssController.php +++ b/core/Controller/CssController.php @@ -62,6 +62,7 @@ class CssController extends Controller { /** * @PublicPage * @NoCSRFRequired + * @NoSameSiteCookieRequired * * @param string $fileName css filename with extension * @param string $appName css folder name diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php index f91fe8f75d5..cdf22eda5fa 100644 --- a/core/Controller/JsController.php +++ b/core/Controller/JsController.php @@ -56,6 +56,7 @@ class JsController extends Controller { /** * @PublicPage * @NoCSRFRequired + * @NoSameSiteCookieRequired * * @param string $fileName js filename with extension * @param string $appName js folder name diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php index c6bf7b94da3..f7159dd9fe1 100644 --- a/core/Controller/SvgController.php +++ b/core/Controller/SvgController.php @@ -57,6 +57,7 @@ class SvgController extends Controller { /** * @PublicPage * @NoCSRFRequired + * @NoSameSiteCookieRequired * * Generate svg from filename with the requested color * @@ -73,6 +74,7 @@ class SvgController extends Controller { /** * @PublicPage * @NoCSRFRequired + * @NoSameSiteCookieRequired * * Generate svg from filename with the requested color * diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 995ff480aa6..aac4843c8e0 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -114,7 +114,7 @@ }); clipboard.on('error', function (e) { var $menu = $(e.trigger); - var $linkTextMenu = $menu.parent().next('li.linkTextMenu') + var $linkTextMenu = $menu.parent().next('li.linkTextMenu'); var $input = $linkTextMenu.find('.linkText'); var actionMsg = ''; @@ -393,8 +393,8 @@ var isLinkShare = this.model.get('linkShare').isLinkShare; var isPasswordSet = !!this.model.get('linkShare').password; - var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink') - var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true + var isPasswordEnforced = this.configModel.get('enforcePasswordForPublicLink'); + var isPasswordEnabledByDefault = this.configModel.get('enableLinkPasswordByDefault') === true; var showPasswordCheckBox = isLinkShare && ( !this.configModel.get('enforcePasswordForPublicLink') || !this.model.get('linkShare').password); |