aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--RELEASE_PROCESS.md2
-rw-r--r--docs/de/user/upgrade.rst2
-rw-r--r--docs/en/user/upgrade.rst2
-rw-r--r--docs/fr/user/upgrade.rst2
-rw-r--r--docs/it/user/installation.rst2
-rw-r--r--docs/it/user/upgrade.rst2
-rw-r--r--src/Wallabag/ApiBundle/Controller/EntryRestController.php3
-rw-r--r--src/Wallabag/ApiBundle/Form/Type/ClientType.php6
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ConfigType.php4
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/RssType.php1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig4
-rw-r--r--src/Wallabag/UserBundle/Resources/views/Security/login.html.twig2
-rw-r--r--tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php16
13 files changed, 37 insertions, 11 deletions
diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index 51b9c4d0..465200eb 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -47,7 +47,7 @@ make release master /tmp wllbg-release prod
47 47
48- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package. 48- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package.
49- Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**). 49- Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**).
50- Update the URL shortener (used on `wllbg.org` to generate links like `http://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`) 50- Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
51- Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date) 51- Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date)
52- Update Dockerfile https://github.com/wallabag/docker (and create a new tag) 52- Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
53- Update wallabag.org website (downloads, releases and new blog post) 53- Update wallabag.org website (downloads, releases and new blog post)
diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst
index af3b96fb..fa2aac45 100644
--- a/docs/de/user/upgrade.rst
+++ b/docs/de/user/upgrade.rst
@@ -61,7 +61,7 @@ Lade das letzte Release von wallabag herunter:
61 61
62.. code-block:: bash 62.. code-block:: bash
63 63
64 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package 64 wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
65 65
66Du findest den `aktuellen MD5-Hash auf unserer Webseite <https://static.wallabag.org/releases/>`_. 66Du findest den `aktuellen MD5-Hash auf unserer Webseite <https://static.wallabag.org/releases/>`_.
67 67
diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst
index 359a355f..3157684c 100644
--- a/docs/en/user/upgrade.rst
+++ b/docs/en/user/upgrade.rst
@@ -65,7 +65,7 @@ Download the last release of wallabag:
65 65
66.. code-block:: bash 66.. code-block:: bash
67 67
68 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package 68 wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
69 69
70You will find the `md5 hash of the latest package on our website <https://static.wallabag.org/releases/>`_. 70You will find the `md5 hash of the latest package on our website <https://static.wallabag.org/releases/>`_.
71 71
diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade.rst
index 5bb42deb..af198006 100644
--- a/docs/fr/user/upgrade.rst
+++ b/docs/fr/user/upgrade.rst
@@ -61,7 +61,7 @@ Téléchargez la dernière version de wallabag :
61 61
62.. code-block:: bash 62.. code-block:: bash
63 63
64 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package 64 wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
65 65
66Vous trouverez `le hash md5 du dernier package sur notre site <https://static.wallabag.org/releases/>`_. 66Vous trouverez `le hash md5 du dernier package sur notre site <https://static.wallabag.org/releases/>`_.
67 67
diff --git a/docs/it/user/installation.rst b/docs/it/user/installation.rst
index c067228d..174507b8 100644
--- a/docs/it/user/installation.rst
+++ b/docs/it/user/installation.rst
@@ -86,7 +86,7 @@ Eseguite questo comando per scaricare ed estrarre il pacchetto piú aggiornato:
86 86
87.. code-block:: bash 87.. code-block:: bash
88 88
89 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package 89 wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
90 90
91Troverete il `hash md5 del pacchetto piú aggiornato sul nostro sito <https://static.wallabag.org/releases/>`_. 91Troverete il `hash md5 del pacchetto piú aggiornato sul nostro sito <https://static.wallabag.org/releases/>`_.
92 92
diff --git a/docs/it/user/upgrade.rst b/docs/it/user/upgrade.rst
index 52cd98c7..ede1a1a3 100644
--- a/docs/it/user/upgrade.rst
+++ b/docs/it/user/upgrade.rst
@@ -78,7 +78,7 @@ Scaricate l'ultima versione di wallabag:
78 78
79. code-block:: bash 79. code-block:: bash
80 80
81 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package 81 wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
82 82
83Troverete il `hash md5 dell'ultima versione del pacchetto sul nostro sito <https://static.wallabag.org/releases/>`_. 83Troverete il `hash md5 dell'ultima versione del pacchetto sul nostro sito <https://static.wallabag.org/releases/>`_.
84 84
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
index dbff6065..632b16d9 100644
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@@ -95,12 +95,13 @@ class EntryRestController extends WallabagRestController
95 $tags = $request->query->get('tags', ''); 95 $tags = $request->query->get('tags', '');
96 $since = $request->query->get('since', 0); 96 $since = $request->query->get('since', 0);
97 97
98 /** @var \Pagerfanta\Pagerfanta $pager */
98 $pager = $this->getDoctrine() 99 $pager = $this->getDoctrine()
99 ->getRepository('WallabagCoreBundle:Entry') 100 ->getRepository('WallabagCoreBundle:Entry')
100 ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags); 101 ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags);
101 102
102 $pager->setCurrentPage($page);
103 $pager->setMaxPerPage($perPage); 103 $pager->setMaxPerPage($perPage);
104 $pager->setCurrentPage($page);
104 105
105 $pagerfantaFactory = new PagerfantaFactory('page', 'perPage'); 106 $pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
106 $paginatedCollection = $pagerfantaFactory->createRepresentation( 107 $paginatedCollection = $pagerfantaFactory->createRepresentation(
diff --git a/src/Wallabag/ApiBundle/Form/Type/ClientType.php b/src/Wallabag/ApiBundle/Form/Type/ClientType.php
index 0ea1a9c5..eaea4feb 100644
--- a/src/Wallabag/ApiBundle/Form/Type/ClientType.php
+++ b/src/Wallabag/ApiBundle/Form/Type/ClientType.php
@@ -16,7 +16,11 @@ class ClientType extends AbstractType
16 { 16 {
17 $builder 17 $builder
18 ->add('name', TextType::class, ['label' => 'developer.client.form.name_label']) 18 ->add('name', TextType::class, ['label' => 'developer.client.form.name_label'])
19 ->add('redirect_uris', UrlType::class, ['required' => false, 'label' => 'developer.client.form.redirect_uris_label']) 19 ->add('redirect_uris', UrlType::class, [
20 'required' => false,
21 'label' => 'developer.client.form.redirect_uris_label',
22 'property_path' => 'redirectUris',
23 ])
20 ->add('save', SubmitType::class, ['label' => 'developer.client.form.save_label']) 24 ->add('save', SubmitType::class, ['label' => 'developer.client.form.save_label'])
21 ; 25 ;
22 26
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 7e3b9dd4..1714ce74 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -39,9 +39,11 @@ class ConfigType extends AbstractType
39 ]) 39 ])
40 ->add('items_per_page', null, [ 40 ->add('items_per_page', null, [
41 'label' => 'config.form_settings.items_per_page_label', 41 'label' => 'config.form_settings.items_per_page_label',
42 'property_path' => 'itemsPerPage',
42 ]) 43 ])
43 ->add('reading_speed', ChoiceType::class, [ 44 ->add('reading_speed', ChoiceType::class, [
44 'label' => 'config.form_settings.reading_speed.label', 45 'label' => 'config.form_settings.reading_speed.label',
46 'property_path' => 'readingSpeed',
45 'choices' => [ 47 'choices' => [
46 'config.form_settings.reading_speed.100_word' => '0.5', 48 'config.form_settings.reading_speed.100_word' => '0.5',
47 'config.form_settings.reading_speed.200_word' => '1', 49 'config.form_settings.reading_speed.200_word' => '1',
@@ -51,6 +53,7 @@ class ConfigType extends AbstractType
51 ]) 53 ])
52 ->add('action_mark_as_read', ChoiceType::class, [ 54 ->add('action_mark_as_read', ChoiceType::class, [
53 'label' => 'config.form_settings.action_mark_as_read.label', 55 'label' => 'config.form_settings.action_mark_as_read.label',
56 'property_path' => 'actionMarkAsRead',
54 'choices' => [ 57 'choices' => [
55 'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE, 58 'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE,
56 'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE, 59 'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE,
@@ -61,6 +64,7 @@ class ConfigType extends AbstractType
61 'label' => 'config.form_settings.language_label', 64 'label' => 'config.form_settings.language_label',
62 ]) 65 ])
63 ->add('pocket_consumer_key', null, [ 66 ->add('pocket_consumer_key', null, [
67 'property_path' => 'pocketConsumerKey',
64 'label' => 'config.form_settings.pocket_consumer_key_label', 68 'label' => 'config.form_settings.pocket_consumer_key_label',
65 ]) 69 ])
66 ->add('save', SubmitType::class, [ 70 ->add('save', SubmitType::class, [
diff --git a/src/Wallabag/CoreBundle/Form/Type/RssType.php b/src/Wallabag/CoreBundle/Form/Type/RssType.php
index 94324fed..49b31c1e 100644
--- a/src/Wallabag/CoreBundle/Form/Type/RssType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/RssType.php
@@ -14,6 +14,7 @@ class RssType extends AbstractType
14 $builder 14 $builder
15 ->add('rss_limit', null, [ 15 ->add('rss_limit', null, [
16 'label' => 'config.form_rss.rss_limit', 16 'label' => 'config.form_rss.rss_limit',
17 'property_path' => 'rssLimit',
17 ]) 18 ])
18 ->add('save', SubmitType::class, [ 19 ->add('save', SubmitType::class, [
19 'label' => 'config.form.save', 20 'label' => 'config.form.save',
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
index db193e81..f82e5dc5 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
@@ -106,8 +106,8 @@
106 <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr> 106 <tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
107 <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr> 107 <tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
108 <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr> 108 <tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
109 <tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr> 109 <tr><td>j0k3r/graby</td><td>MIT</td></tr>
110 <tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr> 110 <tr><td>j0k3r/graby-site-config</td><td>Public domain</td></tr>
111 <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr> 111 <tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
112 <tr><td>j0k3r/safecurl</td><td>MIT</td></tr> 112 <tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
113 <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr> 113 <tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>
diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
index fc0d97e7..32984c84 100644
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
@@ -5,7 +5,7 @@
5 <div class="card-content"> 5 <div class="card-content">
6 6
7 {% if error %} 7 {% if error %}
8 <script>Materialize.toast('{{ error.message }}', 4000)</script> 8 <script>Materialize.toast('{{ error.messageKey|trans(error.messageData, 'security') }}', 4000)</script>
9 {% endif %} 9 {% endif %}
10 10
11 {% for flashMessage in app.session.flashbag.get('notice') %} 11 {% for flashMessage in app.session.flashbag.get('notice') %}
diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
index 362c269b..4f49f040 100644
--- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
@@ -156,6 +156,22 @@ class EntryRestControllerTest extends WallabagApiTestCase
156 $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type')); 156 $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
157 } 157 }
158 158
159 public function testGetEntriesOnPageTwo()
160 {
161 $this->client->request('GET', '/api/entries', [
162 'page' => 2,
163 'perPage' => 2,
164 ]);
165
166 $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
167
168 $content = json_decode($this->client->getResponse()->getContent(), true);
169
170 $this->assertGreaterThanOrEqual(0, $content['total']);
171 $this->assertEquals(2, $content['page']);
172 $this->assertEquals(2, $content['limit']);
173 }
174
159 public function testGetStarredEntries() 175 public function testGetStarredEntries()
160 { 176 {
161 $this->client->request('GET', '/api/entries', ['starred' => 1, 'sort' => 'updated']); 177 $this->client->request('GET', '/api/entries', ['starred' => 1, 'sort' => 'updated']);