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
---
 .../views/themes/material/Developer/client_parameters.html.twig          | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
index b615fa3b..b498cceb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
@@ -9,6 +9,7 @@
             <div class="row">
                 <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
                 <ul>
+                    <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
                     <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
                     <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
                 </ul>
-- 
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

---
 .../material/Developer/client_parameters.html.twig | 23 ----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig

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

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
deleted file mode 100644
index b498cceb..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Developer/client_parameters.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-            <div class="row">
-                <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
-                <ul>
-                    <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
-                    <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
-                    <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
-                </ul>
-
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a>
-                <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a>
-            </div>
-        </div>
-    </div>
-</div>
-{% endblock %}
-- 
cgit v1.2.3