devol/wallabag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4301 from wallabag/fix/4215/add-label-and-issuer-to-o2p-config

Browse Source
This commit is contained in:
Jérémy Benoist 2021-01-04 06:48:10 +01:00 committed by GitHub
commit ff6158811b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/config/config.yml
View File

@ -209,6 +209,7 @@ scheb_two_factor:
google:
enabled: "%twofactor_auth%"
issuer: "%server_name%"
template: WallabagUserBundle:Authentication:form.html.twig
email:

1
app/config/parameters.yml.dist
View File

@ -24,6 +24,7 @@ parameters:
database_charset: utf8mb4
domain_name: https://your-wallabag-url-instance.com
server_name: "Your wallabag instance"
mailer_transport: smtp
mailer_user: ~

2
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/otp_app.html.twig
View File

@ -13,7 +13,7 @@
<p>
<img id="2faQrcode" class="hide-on-med-and-down" />
<script>
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code }}');
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code|raw }}');
</script>
</p>
</li>

2
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig
View File

@ -17,7 +17,7 @@
<p>
<img id="2faQrcode" class="hide-on-med-and-down" />
<script>
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code }}');
document.getElementById('2faQrcode').src = jrQrcode.getQrBase64('{{ qr_code|raw }}');
</script>
</p>