From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel 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') 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 @@
- {{ 'security.login.cancel'|trans }} + {{ 'security.login.cancel'|trans }}
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 %}
- {{ 'security.register.go_to_account'|trans({},'messages') }} + {{ 'security.register.go_to_account'|trans({},'messages') }}
{% 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 @@
- {{ 'security.login.submit'|trans }} + {{ 'security.login.submit'|trans }}
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 @@
- {{ 'security.login.submit'|trans({}, "messages") }} + {{ 'security.login.submit'|trans({}, "messages") }}
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 @@
- {{ 'security.login.register'|trans }} + {{ 'security.login.register'|trans }}
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 @@
-
wallabag logo
+
wallabag logo
{% block fos_user_content %} {% endblock fos_user_content %}
-- cgit v1.2.3 From de3d716ae4e8ca98dabdcb2ec9c18219e05856f7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 2 Jul 2016 14:35:52 +0200 Subject: Add option to disable registration --- .../UserBundle/Controller/RegistrationController.php | 20 ++++++++++++++++++++ .../UserBundle/Controller/SecurityController.php | 18 ++++++++++++++++++ .../UserBundle/DependencyInjection/Configuration.php | 8 ++++++++ .../DependencyInjection/WallabagUserExtension.php | 1 + .../Resources/views/Security/login.html.twig | 4 +++- 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/Wallabag/UserBundle/Controller/RegistrationController.php create mode 100644 src/Wallabag/UserBundle/Controller/SecurityController.php (limited to 'src/Wallabag/UserBundle') diff --git a/src/Wallabag/UserBundle/Controller/RegistrationController.php b/src/Wallabag/UserBundle/Controller/RegistrationController.php new file mode 100644 index 00000000..bba27cfb --- /dev/null +++ b/src/Wallabag/UserBundle/Controller/RegistrationController.php @@ -0,0 +1,20 @@ +container->getParameter('wallabag_user.registration_enabled')) { + parent::registerAction($request); + } + else + { + return $this->redirectToRoute('fos_user_security_login', array(), 301); + } + } +} diff --git a/src/Wallabag/UserBundle/Controller/SecurityController.php b/src/Wallabag/UserBundle/Controller/SecurityController.php new file mode 100644 index 00000000..a5f93763 --- /dev/null +++ b/src/Wallabag/UserBundle/Controller/SecurityController.php @@ -0,0 +1,18 @@ +render('FOSUserBundle:Security:login.html.twig', + array_merge( + $data, + array('registration_enabled' => $this->container->getParameter('wallabag_user.registration_enabled')) + ) + ); + } +} diff --git a/src/Wallabag/UserBundle/DependencyInjection/Configuration.php b/src/Wallabag/UserBundle/DependencyInjection/Configuration.php index 4223f8db..971ce1a0 100644 --- a/src/Wallabag/UserBundle/DependencyInjection/Configuration.php +++ b/src/Wallabag/UserBundle/DependencyInjection/Configuration.php @@ -12,6 +12,14 @@ class Configuration implements ConfigurationInterface $treeBuilder = new TreeBuilder(); $rootNode = $treeBuilder->root('wallabag_user'); + $rootNode + ->children() + ->booleanNode('registration_enabled') + ->defaultValue(true) + ->end() + ->end() + ; + return $treeBuilder; } } diff --git a/src/Wallabag/UserBundle/DependencyInjection/WallabagUserExtension.php b/src/Wallabag/UserBundle/DependencyInjection/WallabagUserExtension.php index c12a8937..99040f69 100644 --- a/src/Wallabag/UserBundle/DependencyInjection/WallabagUserExtension.php +++ b/src/Wallabag/UserBundle/DependencyInjection/WallabagUserExtension.php @@ -16,6 +16,7 @@ class WallabagUserExtension extends Extension $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.yml'); + $container->setParameter('wallabag_user.registration_enabled', $config['registration_enabled']); } public function getAlias() 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 @@
- {{ 'security.login.register'|trans }} + {% if registration_enabled %} + {{ 'security.login.register'|trans }} + {% endif %} + {{ form_end(delete_form) }} +

+

{{ 'user.form.back_to_list'|trans }}

+
+
+ + + + + +{% 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 %} + +
+
+
+
+
+

{{ 'user.description'|trans|raw }}

+ + + + + + + + + + + + + {% for user in users %} + + + + + + + + {% endfor %} + +
{{ 'user.form.username_label'|trans }}{{ 'user.form.email_label'|trans }}{{ 'user.form.last_login_label'|trans }}{{ 'user.form.locked_label'|trans }}{{ 'user.list.actions'|trans }}
{{ user.username }}{{ user.email }}{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}{% if user.locked %}{{ 'user.list.yes'|trans }}{% else %}{{ 'user.list.no'|trans }}{% endif %} + {{ 'user.list.edit_action'|trans }} +
+
+

+ {{ 'user.list.create_new_one'|trans }} +

+
+
+
+
+
+ +{% 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 %} + +
+
+
+
+
+

{{ 'user.new_user'|trans }}

+ +
+ {{ form_start(form) }} + {{ form_errors(form) }} + +
+
+ {{ form_label(form.username) }} + {{ form_errors(form.username) }} + {{ form_widget(form.username) }} +
+
+ +
+
+ {{ form_label(form.plainPassword.first) }} + {{ form_errors(form.plainPassword.first) }} + {{ form_widget(form.plainPassword.first) }} +
+
+ +
+
+ {{ form_label(form.plainPassword.second) }} + {{ form_errors(form.plainPassword.second) }} + {{ form_widget(form.plainPassword.second) }} +
+
+ +
+
+ {{ form_label(form.email) }} + {{ form_errors(form.email) }} + {{ form_widget(form.email) }} +
+
+ + {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_rest(form) }} + +

{{ 'user.form.back_to_list'|trans }}

+
+
+
+
+
+
+ +{% 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 %} + +
+
+
+
+
+

{{ 'user.manage.description'|trans|raw }}

+ + + + + + + + + + + + + + {% for user in users %} + + + + + + + + {% endfor %} + +
{{ 'user.manage.field.username'|trans }}{{ 'user.manage.field.email'|trans }}{{ 'user.manage.field.last_login'|trans }}{{ 'user.manage.field.locked'|trans }}{{ 'user.manage.action'|trans }}
{{ user.username }}{{ user.email }}{{ user.lastLogin|date('d/m/Y H:i:s') }}{{ user.locked ? 'yes' : 'no' }}edit - delete
+
+
+
+
+
+ +{% endblock %} -- cgit v1.2.3 From ccc7faec094387681a59faa5ca79a86e33f06972 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist 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') 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_start(delete_form) }} - + {{ form_end(delete_form) }}

{{ 'user.form.back_to_list'|trans }}

-- cgit v1.2.3 From 755ff9e835614fd66f67615aede950b38f8ab308 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 4 Oct 2016 10:42:45 +0200 Subject: Create config even if user is disabled When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event. There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived. --- src/Wallabag/UserBundle/EventListener/CreateConfigListener.php | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/Wallabag/UserBundle') diff --git a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php index 15f4ac3d..8e2f04e9 100644 --- a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php +++ b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php @@ -45,10 +45,6 @@ class CreateConfigListener implements EventSubscriberInterface public function createConfig(UserEvent $event, $eventName = null, EventDispatcherInterface $eventDispatcher = null) { - if (!$event->getUser()->isEnabled()) { - return; - } - $config = new Config($event->getUser()); $config->setTheme($this->theme); $config->setItemsPerPage($this->itemsOnPage); -- cgit v1.2.3 From 5e7786f3c4f279f78ff80df53480e21b50c3396b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= 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') 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 @@
{{ form_widget(edit_form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - {{ form_rest(edit_form) }} + {{ form_widget(edit_form._token) }}

{{ form_start(delete_form) }} -- cgit v1.2.3 From 38dc91be8ed04f14c180a729a0deb7a57e5cc64a Mon Sep 17 00:00:00 2001 From: Alexandr Danilov 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') 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 @@

{% if error %} - {{ error.message }} + {% endif %} {% for flashMessage in app.session.flashbag.get('notice') %} -

{{ flashMessage }}

 + {% endfor %}
@@ -41,7 +41,7 @@ send
-
+
{{ 'security.login.forgot_password'|trans }}
-- cgit v1.2.3