From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Mar 2016 17:02:34 +0100
Subject: manage assets through npm

first draft

remote assetic totally

work

nearly there

use at least nodejs > 0.12

use proper version of grunt

bump nodejs version for travis

update npm

workaround for materialize

install node 5.0

add grunt-cli

baggy theme & cache node modules

cache bower & npm

make travis build assets on php7 only

exclude installing node & npm if not needed & use bash

clean & try to make icomoon work on baggy

ready

config for travis

rebase

make travis work

more travis work

impove travis & update deps

add missing pixrem deps

add module through oddly lost

ui updates

install latest nodejs

add install_dev.sh, link local binaries for npm/bower/grunt

ui improvements (mostly baggy)

fix travis build

no need to install on travis

Add unread filter to entries pages

Add the ability to filter for unread pages in the filters menu.

Add unread filter test to EntryControllerTest

Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.

Improve English translation

Update FAQ

-Fix grammar
-Add notes about MTA, firewall, and SELinux

Update installation instructions

-Fix grammar
-Add SELinux section

add screenshots of android docu in English

Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121

Move fixtures to the right place

Display a message when saving an entry failed

When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.

Change ManyToMany between entry & tag

Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed

Prepare wallabag 2.0.5

enforce older materialize version
---
 src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig | 4 ++--
 .../UserBundle/Resources/views/Registration/confirmed.html.twig       | 2 +-
 .../Resources/views/Registration/register_content.html.twig           | 4 ++--
 .../UserBundle/Resources/views/Resetting/request_content.html.twig    | 2 +-
 .../UserBundle/Resources/views/Resetting/reset_content.html.twig      | 2 +-
 src/Wallabag/UserBundle/Resources/views/Security/login.html.twig      | 4 ++--
 src/Wallabag/UserBundle/Resources/views/layout.html.twig              | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig b/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig
index acf69196..c8471bdd 100644
--- a/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Authentication/form.html.twig
@@ -23,10 +23,10 @@
         </div>
     </div>
     <div class="card-action center">
-        <a href="{{ path('fos_user_security_logout') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {{ 'security.login.cancel'|trans }}</a>
+        <a href="{{ path('fos_user_security_logout') }}" class="waves-effect waves-light grey btn">{{ 'security.login.cancel'|trans }}</a>
         <button class="btn waves-effect waves-light" type="submit" name="send">
             {{ "scheb_two_factor.login"|trans }}
-            <i class="mdi-content-send right"></i>
+            <i class="material-icons right">send</i>
         </button>
     </div>
 </form>
diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig
index aa4b9bca..cb8d40a4 100644
--- a/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig
@@ -11,7 +11,7 @@
         {% endif %}
     </div>
     <div class="card-action center">
-        <a href="{{ path('homepage') }}" class="waves-effect waves-light btn"><i class="material-icons left"></i> {{ 'security.register.go_to_account'|trans({},'messages') }}</a>
+        <a href="{{ path('homepage') }}" class="waves-effect waves-light btn">{{ 'security.register.go_to_account'|trans({},'messages') }}</a>
     </div>
 </div>
 {% endblock fos_user_content %}
diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig
index 7d2b45d4..d0a85fc7 100644
--- a/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig
@@ -36,10 +36,10 @@
         </div>
     </div>
     <div class="card-action center">
-        <a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {{ 'security.login.submit'|trans }}</a>
+        <a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn">{{ 'security.login.submit'|trans }}</a>
         <button class="btn waves-effect waves-light" type="submit" name="send">
             {{ 'registration.submit'|trans({}, 'FOSUserBundle') }}
-            <i class="mdi-content-send right"></i>
+            <i class="material-icons right">send</i>
         </button>
     </div>
 </form>
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig
index 7a5ac838..010ee0d0 100644
--- a/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig
@@ -21,7 +21,7 @@
     </div>
     <div class="card-action center">
         <a href="{{ path('fos_user_security_login') }}" class="waves-effect waves-light grey btn">
-            <i class="material-icons left"></i> {{ 'security.login.submit'|trans({}, "messages") }}
+            {{ 'security.login.submit'|trans({}, "messages") }}
         </a>
         <button class="btn waves-effect waves-light" type="submit" name="send">
             {{ 'resetting.request.submit'|trans }}
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig
index 9d0a061c..a19dc7d2 100644
--- a/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig
@@ -8,7 +8,7 @@
         <div class="card-action center">
             <button class="btn waves-effect waves-light" type="submit" name="send">
                 {{ 'resetting.reset.submit'|trans }}
-                <i class="mdi-content-send right"></i>
+                <i class="material-icons right">send</i>
             </button>
         </div>
     </div>
diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
index 982a33b2..8474b497 100644
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
@@ -33,10 +33,10 @@
     </div>
     <div class="card-action center">
         <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
-        <a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn"><i class="material-icons left"></i> {{ 'security.login.register'|trans }}</a>
+        <a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn">{{ 'security.login.register'|trans }}</a>
         <button class="btn waves-effect waves-light" type="submit" name="send">
             {{ 'security.login.submit'|trans }}
-            <i class="mdi-content-send right"></i>
+            <i class="material-icons right">send</i>
         </button>
     </div>
     <div class="center">
diff --git a/src/Wallabag/UserBundle/Resources/views/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
index 1d0189ca..1f6ea255 100644
--- a/src/Wallabag/UserBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
@@ -11,7 +11,7 @@
 <main class="valign-wrapper">
     <div class="valign row">
         <div class="card sw">
-            <div class="center"><img src="{{ asset('bundles/wallabagcore/themes/material/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
+            <div class="center"><img src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
             {% block fos_user_content %}
             {% endblock fos_user_content %}
         </div>
-- 
cgit v1.2.3


From de3d716ae4e8ca98dabdcb2ec9c18219e05856f7 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 2 Jul 2016 14:35:52 +0200
Subject: Add option to disable registration

---
 src/Wallabag/UserBundle/Resources/views/Security/login.html.twig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
index 8474b497..13a903ab 100644
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
@@ -33,7 +33,9 @@
     </div>
     <div class="card-action center">
         <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
-        <a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn">{{ 'security.login.register'|trans }}</a>
+        {% if registration_enabled %}
+            <a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn">{{ 'security.login.register'|trans }}</a>
+        {% endif %}
         <button class="btn waves-effect waves-light" type="submit" name="send">
             {{ 'security.login.submit'|trans }}
             <i class="material-icons right">send</i>
-- 
cgit v1.2.3


From ef75e1220ebb76a8df019d946460ad612759f0bb Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sat, 3 Sep 2016 17:36:57 +0200
Subject: Send every imported item to the queue

Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format.
Then, the worker retrieve that information, find / create the entry and save it.
---
 src/Wallabag/UserBundle/Resources/config/services.yml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml
index d79d8fa2..05830555 100644
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -14,3 +14,9 @@ services:
             - "@router"
         tags:
             - { name: kernel.event_subscriber }
+
+    wallabag_user.user_repository:
+        class: Wallabag\UserBundle\Repository\UserRepository
+        factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
+        arguments:
+            - WallabagUserBundle:User
-- 
cgit v1.2.3


From a00bed8b59b4dc30a440da0e653bdc7524d2c714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Rumi=C5=84ski?= <matt.ruminski@hotmail.com>
Date: Mon, 19 Sep 2016 20:42:55 +0200
Subject: polish version

create wallabag_user.pl.yml file
---
 .../UserBundle/Resources/translations/wallabag_user.pl.yml    | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/Wallabag/UserBundle/Resources/translations/wallabag_user.pl.yml

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.pl.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.pl.yml
new file mode 100644
index 00000000..90be9a4f
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.pl.yml
@@ -0,0 +1,11 @@
+# Two factor mail
+auth_code:
+    on: 'włączony'
+    mailer:
+        subject: 'Kod autoryzacyjny Wallabag'
+        body:
+            hello: "Cześć %user%,"
+            first_para: "Od momentu włączenia na swoim koncie autoryzacji dwuetapowej i zalogowaniu się na nowym urzączeniu (komputer, telefon, etc.), wyślemy do ciebie kod potwierdzający twoje połączenie
+            second_para: "Tutaj jest twój kod:"
+            support: "Nie wahaj się skontaktować z nami, jeżeli masz jakiekolwiek problemy:"
+            signature: "Zespół wallabag"
-- 
cgit v1.2.3


From 267b9d62dcefb79e16a6247d18e56465ccafdc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Rumi=C5=84ski?= <matt.ruminski@hotmail.com>
Date: Mon, 19 Sep 2016 22:37:03 +0200
Subject: Update wallabag_user.pl.yml

add missing "
---
 src/Wallabag/UserBundle/Resources/translations/wallabag_user.pl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.pl.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.pl.yml
index 90be9a4f..04dbef39 100644
--- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.pl.yml
+++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.pl.yml
@@ -5,7 +5,7 @@ auth_code:
         subject: 'Kod autoryzacyjny Wallabag'
         body:
             hello: "Cześć %user%,"
-            first_para: "Od momentu włączenia na swoim koncie autoryzacji dwuetapowej i zalogowaniu się na nowym urzączeniu (komputer, telefon, etc.), wyślemy do ciebie kod potwierdzający twoje połączenie
+            first_para: "Od momentu włączenia na swoim koncie autoryzacji dwuetapowej i zalogowaniu się na nowym urzączeniu (komputer, telefon, etc.), wyślemy do ciebie kod potwierdzający twoje połączenie"
             second_para: "Tutaj jest twój kod:"
             support: "Nie wahaj się skontaktować z nami, jeżeli masz jakiekolwiek problemy:"
             signature: "Zespół wallabag"
-- 
cgit v1.2.3


From ca17abce2d3963e266bee905ab084ddfa7e1ff18 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 30 Sep 2016 21:01:36 +0200
Subject: Create user config in one place

Using a listener, user config is now created when a user:

- is created from the command line
- register (with or without email confirmation)
- is created from the config panel
---
 src/Wallabag/UserBundle/Resources/config/services.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml
index 05830555..eb9c8e67 100644
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -20,3 +20,15 @@ services:
         factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
         arguments:
             - WallabagUserBundle:User
+
+    wallabag_user.create_config:
+        class: Wallabag\UserBundle\EventListener\CreateConfigListener
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "%wallabag_core.theme%"
+            - "%wallabag_core.items_on_page%"
+            - "%wallabag_core.rss_limit%"
+            - "%wallabag_core.language%"
+            - "%wallabag_core.reading_speed%"
+        tags:
+            - { name: kernel.event_subscriber }
-- 
cgit v1.2.3


From fb7354c4a430f4f4916a1247aa1b1bf564ead0da Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 30 Sep 2016 21:02:44 +0200
Subject: Fix bad template name

When a user register, the template displayed saying it should now check its email was misspelled.
Resulting in displaying the default one (with margin issue).
---
 .../Resources/views/Registration/checkEmail.html.twig         | 11 -----------
 .../Resources/views/Registration/check_email.html.twig        | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig
 create mode 100644 src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig
deleted file mode 100644
index 50937276..00000000
--- a/src/Wallabag/UserBundle/Resources/views/Registration/checkEmail.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "FOSUserBundle::layout.html.twig" %}
-
-{% trans_default_domain 'FOSUserBundle' %}
-
-{% block fos_user_content %}
-<div class="card-content">
-    <div class="row">
-        <p>{{ 'registration.check_email'|trans({'%email%': user.email}) }}</p>
-    </div>
-</div>
-{% endblock fos_user_content %}
diff --git a/src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig b/src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig
new file mode 100644
index 00000000..50937276
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig
@@ -0,0 +1,11 @@
+{% extends "FOSUserBundle::layout.html.twig" %}
+
+{% trans_default_domain 'FOSUserBundle' %}
+
+{% block fos_user_content %}
+<div class="card-content">
+    <div class="row">
+        <p>{{ 'registration.check_email'|trans({'%email%': user.email}) }}</p>
+    </div>
+</div>
+{% endblock fos_user_content %}
-- 
cgit v1.2.3


From 152fcccd4489378a8ed9391e3e191df4aeba6435 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 30 Sep 2016 20:09:06 +0200
Subject: Add users management UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
---
 .../Resources/views/Manage/edit.html.twig          | 86 ++++++++++++++++++++++
 .../Resources/views/Manage/index.html.twig         | 48 ++++++++++++
 .../Resources/views/Manage/new.html.twig           | 61 +++++++++++++++
 .../UserBundle/Resources/views/manage.html.twig    | 43 +++++++++++
 4 files changed, 238 insertions(+)
 create mode 100644 src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
 create mode 100644 src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
 create mode 100644 src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig
 create mode 100644 src/Wallabag/UserBundle/Resources/views/manage.html.twig

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
new file mode 100644
index 00000000..5292ba78
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
@@ -0,0 +1,86 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'user.page_title'|trans }}{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+                <div class="row">
+                    <div class="input-field col s12">
+                        <h4>{{ 'user.edit_user'|trans }}</h4>
+
+                        <div id="set6" class="col s12">
+                            {{ form_start(edit_form) }}
+                                {{ form_errors(edit_form) }}
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.name) }}
+                                        {{ form_errors(edit_form.name) }}
+                                        {{ form_widget(edit_form.name) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.username) }}
+                                        {{ form_errors(edit_form.username) }}
+                                        {{ form_widget(edit_form.username) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(edit_form.email) }}
+                                        {{ form_errors(edit_form.email) }}
+                                        {{ form_widget(edit_form.email) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_widget(edit_form.enabled) }}
+                                        {{ form_label(edit_form.enabled) }}
+                                        {{ form_errors(edit_form.enabled) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_widget(edit_form.locked) }}
+                                        {{ form_label(edit_form.locked) }}
+                                        {{ form_errors(edit_form.locked) }}
+                                    </div>
+                                </div>
+
+                                {% if twofactor_auth %}
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_widget(edit_form.twoFactorAuthentication) }}
+                                        {{ form_label(edit_form.twoFactorAuthentication) }}
+                                        {{ form_errors(edit_form.twoFactorAuthentication) }}
+                                    </div>
+                                </div>
+                                {% endif %}
+
+                                <br/>
+
+                                {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
+                                {{ form_rest(edit_form) }}
+                            </form>
+                            <p>
+                                {{ form_start(delete_form) }}
+                                    <button onclick="return confirm('{{ 'user.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'user.form.delete'|trans }}</button>
+                                {{ form_end(delete_form) }}
+                            </p>
+                            <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('user_index') }}">{{ 'user.form.back_to_list'|trans }}</a></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
new file mode 100644
index 00000000..996bdb1a
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -0,0 +1,48 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'user.page_title'|trans }}{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+                <div class="row">
+                    <div class="input-field col s12">
+                        <p class="help">{{ 'user.description'|trans|raw }}</p>
+
+                        <table class="bordered">
+                            <thead>
+                                <tr>
+                                    <th>{{ 'user.form.username_label'|trans }}</th>
+                                    <th>{{ 'user.form.email_label'|trans }}</th>
+                                    <th>{{ 'user.form.last_login_label'|trans }}</th>
+                                    <th>{{ 'user.form.locked_label'|trans }}</th>
+                                    <th>{{ 'user.list.actions'|trans }}</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            {% for user in users %}
+                                <tr>
+                                    <td>{{ user.username }}</td>
+                                    <td>{{ user.email }}</td>
+                                    <td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td>
+                                    <td>{% if user.locked %}{{ 'user.list.yes'|trans }}{% else %}{{ 'user.list.no'|trans }}{% endif %}</td>
+                                    <td>
+                                        <a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a>
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                            </tbody>
+                        </table>
+                        <br />
+                        <p>
+                            <a href="{{ path('user_new') }}" class="waves-effect waves-light btn">{{ 'user.list.create_new_one'|trans }}</a>
+                        </p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig
new file mode 100644
index 00000000..8c894c04
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig
@@ -0,0 +1,61 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'user.page_title'|trans }}{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+                <div class="row">
+                    <div class="input-field col s12">
+                        <h4>{{ 'user.new_user'|trans }}</h4>
+
+                        <div id="set6" class="col s12">
+                            {{ form_start(form) }}
+                                {{ form_errors(form) }}
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.username) }}
+                                        {{ form_errors(form.username) }}
+                                        {{ form_widget(form.username) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.plainPassword.first) }}
+                                        {{ form_errors(form.plainPassword.first) }}
+                                        {{ form_widget(form.plainPassword.first) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.plainPassword.second) }}
+                                        {{ form_errors(form.plainPassword.second) }}
+                                        {{ form_widget(form.plainPassword.second) }}
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="input-field col s12">
+                                        {{ form_label(form.email) }}
+                                        {{ form_errors(form.email) }}
+                                        {{ form_widget(form.email) }}
+                                    </div>
+                                </div>
+
+                                {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
+                                {{ form_rest(form) }}
+                            </form>
+                            <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('user_index') }}">{{ 'user.form.back_to_list'|trans }}</a></p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
diff --git a/src/Wallabag/UserBundle/Resources/views/manage.html.twig b/src/Wallabag/UserBundle/Resources/views/manage.html.twig
new file mode 100644
index 00000000..c614c55f
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/views/manage.html.twig
@@ -0,0 +1,43 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'user.manage.page_title'|trans }}{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+                <div class="row">
+                    <div class="input-field col s12">
+                        <p class="help">{{ 'user.manage.description'|trans|raw }}</p>
+
+                        <table class="bordered">
+                            <thead>
+                                <tr>
+                                    <th>{{ 'user.manage.field.username'|trans }}</th>
+                                    <th>{{ 'user.manage.field.email'|trans }}</th>
+                                    <th>{{ 'user.manage.field.last_login'|trans }}</th>
+                                    <th>{{ 'user.manage.field.locked'|trans }}</th>
+                                    <th>{{ 'user.manage.action'|trans }}</th>
+                                </tr>
+                            </thead>
+
+                            <tbody>
+                                {% for user in users %}
+                                    <tr>
+                                        <td>{{ user.username }}</td>
+                                        <td>{{ user.email }}</td>
+                                        <td>{{ user.lastLogin|date('d/m/Y H:i:s') }}</td>
+                                        <td>{{ user.locked ? 'yes' : 'no' }}</td>
+                                        <td>edit - delete</td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
-- 
cgit v1.2.3


From ccc7faec094387681a59faa5ca79a86e33f06972 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 2 Oct 2016 13:21:45 +0200
Subject: Disabled delete button for the logged user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To avoid some bad things to happen…
---
 src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
index 5292ba78..d5cf99c3 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
@@ -72,7 +72,7 @@
                             </form>
                             <p>
                                 {{ form_start(delete_form) }}
-                                    <button onclick="return confirm('{{ 'user.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'user.form.delete'|trans }}</button>
+                                    <button {% if app.user.id == user.id %}disabled="disabled"{% endif %} onclick="return confirm('{{ 'user.form.delete_confirm'|trans|escape('js') }}')" type="submit" class="btn waves-effect waves-light red">{{ 'user.form.delete'|trans }}</button>
                                 {{ form_end(delete_form) }}
                             </p>
                             <p><a class="waves-effect waves-light btn blue-grey" href="{{ path('user_index') }}">{{ 'user.form.back_to_list'|trans }}</a></p>
-- 
cgit v1.2.3


From 5e7786f3c4f279f78ff80df53480e21b50c3396b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 7 Oct 2016 14:56:26 +0200
Subject: Fixed two-factor checkbox display in user admin panel Fix #2380

---
 src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
index d5cf99c3..67843f20 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
@@ -68,7 +68,7 @@
                                 <br/>
 
                                 {{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-                                {{ form_rest(edit_form) }}
+                                {{ form_widget(edit_form._token) }}
                             </form>
                             <p>
                                 {{ form_start(delete_form) }}
-- 
cgit v1.2.3


From 38dc91be8ed04f14c180a729a0deb7a57e5cc64a Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Sat, 15 Oct 2016 11:17:55 +0300
Subject: Improved side menu, reduced the font size on small screens, fixed a
 form to add links on small screens

---
 src/Wallabag/UserBundle/Resources/views/Security/login.html.twig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Wallabag/UserBundle/Resources')

diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
index 938f1a31..fc0d97e7 100644
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
@@ -5,11 +5,11 @@
     <div class="card-content">
 
         {% if error %}
-            <span class="black-text">{{ error.message }}</span>
+            <script>Materialize.toast('{{ error.message }}', 4000)</script>
         {% endif %}
 
         {% for flashMessage in app.session.flashbag.get('notice') %}
-            <span class="black-text"><p>{{ flashMessage }}</p></span>
+            <script>Materialize.toast('{{ flashMessage }}')</script>
         {% endfor %}
 
         <div class="row">
@@ -41,7 +41,7 @@
             <i class="material-icons right">send</i>
         </button>
     </div>
-    <div class="row center">
+    <div class="card-action center">
         <a href="{{ path('fos_user_resetting_request') }}">{{ 'security.login.forgot_password'|trans }}</a>
     </div>
 </form>
-- 
cgit v1.2.3