From 5a5846149164086fe6f8e1fada6a4ab3bb910a87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@smile.fr>
Date: Wed, 12 Aug 2015 12:27:12 +0200
Subject: add 'stay connected' checkbox

---
 app/config/security.yml                                            | 6 ++++++
 .../Resources/views/themes/material/Security/login.html.twig       | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/config/security.yml b/app/config/security.yml
index 37236d40..2163389b 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -51,6 +51,12 @@ security:
                 csrf_parameter:                 _csrf_token
                 intention:                      authenticate
 
+            remember_me:
+                key:      "%secret%"
+                lifetime: 31536000
+                path:     /
+                domain:   ~
+
             logout:
                 path:   /logout
                 target: /
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
index 8f60fbe2..26d039c7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
@@ -33,6 +33,11 @@
                             <input type="password" id="password" name="_password" />
                         </div>
 
+                        <div class="input-field s12">
+                            <input type="checkbox" id="remember_me" name="_remember_me" checked />
+<label for="remember_me">Keep me logged in</label>
+                        </div>
+
                     </div>
                     <div class="card-action">
                         <button class="btn waves-effect waves-light" type="submit" name="send">
@@ -55,4 +60,4 @@
 {% endblock %}
 
 {% block footer %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
-- 
cgit v1.2.3


From 579764b264685b20e82f0030ed3ed8e87b2d6e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@smile.fr>
Date: Wed, 12 Aug 2015 13:03:26 +0200
Subject: fix indentation

---
 .../CoreBundle/Resources/views/themes/material/Security/login.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
index 26d039c7..22afdd7b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
@@ -35,7 +35,7 @@
 
                         <div class="input-field s12">
                             <input type="checkbox" id="remember_me" name="_remember_me" checked />
-<label for="remember_me">Keep me logged in</label>
+                            <label for="remember_me">Keep me logged in</label>
                         </div>
 
                     </div>
-- 
cgit v1.2.3


From 6622cf996830a037081dba8fa8b2793ffd998bc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Wed, 12 Aug 2015 13:21:07 +0200
Subject: add translation

---
 .../CoreBundle/Resources/views/themes/material/Security/login.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
index 22afdd7b..73abc3f8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
@@ -35,7 +35,7 @@
 
                         <div class="input-field s12">
                             <input type="checkbox" id="remember_me" name="_remember_me" checked />
-                            <label for="remember_me">Keep me logged in</label>
+                            <label for="remember_me">{% trans %}Keep me logged in{% endtrans %}</label>
                         </div>
 
                     </div>
-- 
cgit v1.2.3