aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-11-23 15:14:05 +0100
committerGitHub <noreply@github.com>2016-11-23 15:14:05 +0100
commitb5e0bbeb85b741413867c6179158a28e7a5bddc8 (patch)
tree5630b9daf08589568e67c7f7e23419f416a6268c /app
parentf4a98334903f01e6109b09e27dc1ebefab8f8865 (diff)
parent66e9dde0dc0ba5f554231a7a968ef5b530a0563f (diff)
downloadwallabag-b5e0bbeb85b741413867c6179158a28e7a5bddc8.tar.gz
wallabag-b5e0bbeb85b741413867c6179158a28e7a5bddc8.tar.zst
wallabag-b5e0bbeb85b741413867c6179158a28e7a5bddc8.zip
Merge pull request #2642 from wallabag/fix-logout-shortcut
Fixed logout shortcut
Diffstat (limited to 'app')
-rw-r--r--app/Resources/static/themes/_global/js/shortcuts/main.js2
-rw-r--r--app/config/config.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js
index ef6a1b84..c81bf869 100644
--- a/app/Resources/static/themes/_global/js/shortcuts/main.js
+++ b/app/Resources/static/themes/_global/js/shortcuts/main.js
@@ -12,4 +12,4 @@ Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config');
12Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); 12Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); });
13Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); 13Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); });
14Mousetrap.bind('?', () => { window.location.href = Routing.generate('howto'); }); 14Mousetrap.bind('?', () => { window.location.href = Routing.generate('howto'); });
15Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); 15Mousetrap.bind('g l', () => { window.location.href = Routing.generate('fos_user_security_logout'); });
diff --git a/app/config/config.yml b/app/config/config.yml
index 5f939ab5..6b1ed056 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -366,5 +366,5 @@ fos_js_routing:
366 - import 366 - import
367 - developer 367 - developer
368 - howto 368 - howto
369 - logout 369 - fos_user_security_logout
370 - new 370 - new