From 9c545fe028013b30417c1a932cd6b9027bff752d Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 21 May 2016 18:09:38 +0200
Subject: Added name on client

- Fix typos in field name
- Added migration for name field in API client table

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171
---
 .../Resources/views/themes/baggy/Developer/client.html.twig         | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
index 78a9dc04..8a5da71a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
@@ -12,6 +12,12 @@
                 {{ form_start(form) }}
                 {{ form_errors(form) }}
 
+                <div class="input-field col s12">
+                    {{ form_label(form.name) }}
+                    {{ form_errors(form.name) }}
+                    {{ form_widget(form.name) }}
+                </div>
+
                 <div class="input-field col s12">
                     {{ form_label(form.redirect_uris) }}
                     {{ form_errors(form.redirect_uris) }}
-- 
cgit v1.2.3


From 2ff9991a1dfac0d3463662b96f529aac70c66f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 30 Sep 2016 09:38:08 +0200
Subject: Removed duplicated templates files

---
 .../views/themes/baggy/Developer/client.html.twig  | 37 ----------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
deleted file mode 100644
index 8a5da71a..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Developer/client.html.twig
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <p>{{ 'developer.client.page_description'|trans }}</p>
-                {{ form_start(form) }}
-                {{ form_errors(form) }}
-
-                <div class="input-field col s12">
-                    {{ form_label(form.name) }}
-                    {{ form_errors(form.name) }}
-                    {{ form_widget(form.name) }}
-                </div>
-
-                <div class="input-field col s12">
-                    {{ form_label(form.redirect_uris) }}
-                    {{ form_errors(form.redirect_uris) }}
-                    {{ form_widget(form.redirect_uris) }}
-                </div>
-
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a>
-                {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
-
-                {{ form_rest(form) }}
-            </div>
-
-        </div>
-    </div>
-</div>
-
-{% endblock %}
-- 
cgit v1.2.3