aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources/static
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-11-03 14:55:24 +0100
committerGitHub <noreply@github.com>2016-11-03 14:55:24 +0100
commit816c0940d142f8ec69bdd3f302c9751033cce7e2 (patch)
tree27390401e4c6cbd56295ba913c2597f3618ad962 /app/Resources/static
parent5feef9f7a4e6852415feb388190b7ca141f116d1 (diff)
parent32508ef07aeb43966694ae360eeaeff8325e2a4d (diff)
downloadwallabag-816c0940d142f8ec69bdd3f302c9751033cce7e2.tar.gz
wallabag-816c0940d142f8ec69bdd3f302c9751033cce7e2.tar.zst
wallabag-816c0940d142f8ec69bdd3f302c9751033cce7e2.zip
Merge pull request #2523 from wallabag/qrcode-android-app
Added QRCode and link to configure android application
Diffstat (limited to 'app/Resources/static')
-rw-r--r--app/Resources/static/themes/_global/js/tools.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js
index ab30deb1..55de090c 100644
--- a/app/Resources/static/themes/_global/js/tools.js
+++ b/app/Resources/static/themes/_global/js/tools.js
@@ -1,5 +1,8 @@
1const $ = require('jquery'); 1const $ = require('jquery');
2 2
3/* Allows inline call qr-code call */
4import jrQrcode from 'jr-qrcode'; // eslint-disable-line
5
3function supportsLocalStorage() { 6function supportsLocalStorage() {
4 try { 7 try {
5 return 'localStorage' in window && window.localStorage !== null; 8 return 'localStorage' in window && window.localStorage !== null;