From 1f4408de9ed08f3b0fda45a93f1585c80feeb21d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@smile.fr>
Date: Tue, 20 Oct 2015 13:58:13 +0200
Subject: 1st draft for Pocket import via API

---
 .../ImportBundle/Resources/views/Pocket/index.html.twig  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig

(limited to 'src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig')

diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
new file mode 100644
index 00000000..d47dd8d5
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -0,0 +1,16 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+{% block title %}{% trans %}import{% endtrans %}{% endblock %}
+
+{% block content %}
+
+<div class="row">
+    <div class="col s12">
+        <div class="card-panel settings">
+            {% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}
+            <form method="post" action="{{ path('authpocket') }}">
+                <input type="submit" value="Connect to Pocket" />
+            </form>
+        </div>
+    </div>
+</div>
+{% endblock %}
-- 
cgit v1.2.3


From 87f23b005c5f68f7463333a74317efa4eb9a9565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@smile.fr>
Date: Mon, 26 Oct 2015 10:55:35 +0100
Subject: assign tags to entries and add lastPocketImport attribute to user

---
 src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig')

diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index d47dd8d5..e6abc17b 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -8,7 +8,7 @@
         <div class="card-panel settings">
             {% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}
             <form method="post" action="{{ path('authpocket') }}">
-                <input type="submit" value="Connect to Pocket" />
+                <input type="submit" value="Connect to Pocket and import data" />
             </form>
         </div>
     </div>
-- 
cgit v1.2.3


From 0aa344dc247c77376fcbf2112191f9f8b3dfc846 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Thu, 24 Dec 2015 15:22:56 +0100
Subject: Update url & service name

Prefix ur with service namel: [service]_[route name]
Add comment in Interface
---
 src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig')

diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index e6abc17b..df64e472 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -7,7 +7,7 @@
     <div class="col s12">
         <div class="card-panel settings">
             {% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}
-            <form method="post" action="{{ path('authpocket') }}">
+            <form method="post" action="{{ path('pocket_auth') }}">
                 <input type="submit" value="Connect to Pocket and import data" />
             </form>
         </div>
-- 
cgit v1.2.3


From 252ebd60719d32ec954d0519c9edf2b52b03310c Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Wed, 30 Dec 2015 12:23:51 +0100
Subject: Rewrote Pocket Import

For the moment, we won't do a queue system, just a plain synchronous import.
We also use ContentProxy to grab content for each article from Pocket.
Error from Pocket are now logged using the logger.
The ImportInterface need to be simple and not related to oAuth (not all import will use that method).
---
 src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig')

diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index df64e472..940fe4cc 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -7,7 +7,7 @@
     <div class="col s12">
         <div class="card-panel settings">
             {% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}
-            <form method="post" action="{{ path('pocket_auth') }}">
+            <form method="post" action="{{ path('import_pocket_auth') }}">
                 <input type="submit" value="Connect to Pocket and import data" />
             </form>
         </div>
-- 
cgit v1.2.3


From 7019c7cf6c6af39c0f458769e20c3f9306477943 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Thu, 31 Dec 2015 11:24:46 +0100
Subject: Add tagged services for import

- list services in /import
- add url to import service
- ImportBundle routing are now prefixed by /import
- optimize flush in each import (flushing each 20 contents)
- improve design of each import
- add more tests
---
 .../ImportBundle/Resources/views/Pocket/index.html.twig        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig')

diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index 940fe4cc..9803896c 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -1,14 +1,16 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{% trans %}import{% endtrans %}{% endblock %}
+{% block title %}{% trans %}Import > Pocket{% endtrans %}{% endblock %}
 
 {% block content %}
-
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}
+            <blockquote>{{ import.description|raw }}</blockquote>
+            <p>{% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}</p>
             <form method="post" action="{{ path('import_pocket_auth') }}">
-                <input type="submit" value="Connect to Pocket and import data" />
+                <button class="btn waves-effect waves-light" type="submit" name="action">
+                    Connect to Pocket and import data
+                </button>
             </form>
         </div>
     </div>
-- 
cgit v1.2.3


From d1af8ad4dbf7f3ce5170655c2fa8403406283039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 5 Jan 2016 22:38:09 +0100
Subject: Added french translations

---
 src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig')

diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index 9803896c..58053780 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -9,7 +9,7 @@
             <p>{% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}</p>
             <form method="post" action="{{ path('import_pocket_auth') }}">
                 <button class="btn waves-effect waves-light" type="submit" name="action">
-                    Connect to Pocket and import data
+                    {% trans %}Connect to Pocket and import data{% endtrans %}
                 </button>
             </form>
         </div>
-- 
cgit v1.2.3


From b88cf91fc8371194df78e690983c61ea94f266cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Wed, 6 Jan 2016 06:34:57 +0100
Subject: updated tests

---
 src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig')

diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
index 58053780..643ad775 100644
--- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig
@@ -5,7 +5,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            <blockquote>{{ import.description|raw }}</blockquote>
+            <blockquote>{{ import.description|trans }}</blockquote>
             <p>{% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}</p>
             <form method="post" action="{{ path('import_pocket_auth') }}">
                 <button class="btn waves-effect waves-light" type="submit" name="action">
-- 
cgit v1.2.3