aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2017-05-09 13:55:31 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2017-05-09 13:55:31 +0200
commit54c2d164a362e64a320438b439bf9dd6d2c02424 (patch)
treedc25a86685524e642cedfd95d02736ef06b28f77 /src
parentb28c5430efefa63d04d87404c99798e82d0427e4 (diff)
parentc829b06ed8f757f2b96515eb872f9ccf20363c94 (diff)
downloadwallabag-54c2d164a362e64a320438b439bf9dd6d2c02424.tar.gz
wallabag-54c2d164a362e64a320438b439bf9dd6d2c02424.tar.zst
wallabag-54c2d164a362e64a320438b439bf9dd6d2c02424.zip
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'src')
-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
6 files changed, 15 insertions, 5 deletions
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') %}