aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/ApiBundle/Controller/EntryRestController.php17
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig9
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig10
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig2
18 files changed, 47 insertions, 28 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
index 632b16d9..4801811d 100644
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@@ -297,10 +297,19 @@ class EntryRestController extends WallabagRestController
297 $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId()); 297 $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId());
298 298
299 if (false === $entry) { 299 if (false === $entry) {
300 $entry = $this->get('wallabag_core.content_proxy')->updateEntry( 300 $entry = new Entry($this->getUser());
301 new Entry($this->getUser()), 301 try {
302 $url 302 $entry = $this->get('wallabag_core.content_proxy')->updateEntry(
303 ); 303 $entry,
304 $url
305 );
306 } catch (\Exception $e) {
307 $this->get('logger')->error('Error while saving an entry', [
308 'exception' => $e,
309 'entry' => $entry,
310 ]);
311 $entry->setUrl($url);
312 }
304 } 313 }
305 314
306 if (!is_null($title)) { 315 if (!is_null($title)) {
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index ee66c728..556578d1 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -3,6 +3,7 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Doctrine\ORM\EntityRepository; 5use Doctrine\ORM\EntityRepository;
6use Lexik\Bundle\FormFilterBundle\Filter\FilterOperands;
6use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; 7use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
7use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType; 8use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType;
8use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType; 9use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType;
@@ -33,7 +34,7 @@ class EntryFilterType extends AbstractType
33 $this->user = $tokenStorage->getToken() ? $tokenStorage->getToken()->getUser() : null; 34 $this->user = $tokenStorage->getToken() ? $tokenStorage->getToken()->getUser() : null;
34 35
35 if (null === $this->user || !is_object($this->user)) { 36 if (null === $this->user || !is_object($this->user)) {
36 return null; 37 return;
37 } 38 }
38 } 39 }
39 40
@@ -41,6 +42,14 @@ class EntryFilterType extends AbstractType
41 { 42 {
42 $builder 43 $builder
43 ->add('readingTime', NumberRangeFilterType::class, [ 44 ->add('readingTime', NumberRangeFilterType::class, [
45 'left_number_options' => [
46 'condition_operator' => FilterOperands::OPERATOR_GREATER_THAN_EQUAL,
47 'attr' => ['min' => 0],
48 ],
49 'right_number_options' => [
50 'condition_operator' => FilterOperands::OPERATOR_LOWER_THAN_EQUAL,
51 'attr' => ['min' => 0],
52 ],
44 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { 53 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
45 $lower = $values['value']['left_number'][0]; 54 $lower = $values['value']['left_number'][0];
46 $upper = $values['value']['right_number'][0]; 55 $upper = $values['value']['right_number'][0];
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 57319af7..1bd0b8fd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -215,7 +215,7 @@ entry:
215 # share_email_label: 'Email' 215 # share_email_label: 'Email'
216 # public_link: 'public link' 216 # public_link: 'public link'
217 # delete_public_link: 'delete public link' 217 # delete_public_link: 'delete public link'
218 download: 'Download' 218 # export: 'Export'
219 # print: 'Print' 219 # print: 'Print'
220 problem: 220 problem:
221 label: 'Problemer?' 221 label: 'Problemer?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index a7bcecc6..94bb3295 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: 'E-Mail' 216 share_email_label: 'E-Mail'
217 public_link: 'Öffentlicher Link' 217 public_link: 'Öffentlicher Link'
218 delete_public_link: 'Lösche öffentlichen Link' 218 delete_public_link: 'Lösche öffentlichen Link'
219 download: 'Herunterladen' 219 export: 'Exportieren'
220 print: 'Drucken' 220 print: 'Drucken'
221 problem: 221 problem:
222 label: 'Probleme?' 222 label: 'Probleme?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 1ef2874d..3a006a0e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: 'Email' 216 share_email_label: 'Email'
217 public_link: 'public link' 217 public_link: 'public link'
218 delete_public_link: 'delete public link' 218 delete_public_link: 'delete public link'
219 download: 'Download' 219 export: 'Export'
220 print: 'Print' 220 print: 'Print'
221 problem: 221 problem:
222 label: 'Problems?' 222 label: 'Problems?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 6cd079b0..ca5d9b2c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: 'e-mail' 216 share_email_label: 'e-mail'
217 public_link: 'enlace público' 217 public_link: 'enlace público'
218 delete_public_link: 'eliminar enlace público' 218 delete_public_link: 'eliminar enlace público'
219 download: 'Descargar' 219 export: 'Exportar'
220 print: 'Imprimir' 220 print: 'Imprimir'
221 problem: 221 problem:
222 label: '¿Algún problema?' 222 label: '¿Algún problema?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index fb6e315e..ecd8f64d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: 'نشانی ایمیل' 216 share_email_label: 'نشانی ایمیل'
217 # public_link: 'public link' 217 # public_link: 'public link'
218 # delete_public_link: 'delete public link' 218 # delete_public_link: 'delete public link'
219 download: 'بارگیری' 219 export: 'بارگیری'
220 print: 'چاپ' 220 print: 'چاپ'
221 problem: 221 problem:
222 label: 'مشکلات؟' 222 label: 'مشکلات؟'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index ad886363..84706459 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: "Courriel" 216 share_email_label: "Courriel"
217 public_link: "Lien public" 217 public_link: "Lien public"
218 delete_public_link: "Supprimer le lien public" 218 delete_public_link: "Supprimer le lien public"
219 download: "Télécharger" 219 export: "Exporter"
220 print: "Imprimer" 220 print: "Imprimer"
221 problem: 221 problem:
222 label: "Un problème ?" 222 label: "Un problème ?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 5a9605ff..a8baa96f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: 'E-mail' 216 share_email_label: 'E-mail'
217 # public_link: 'public link' 217 # public_link: 'public link'
218 # delete_public_link: 'delete public link' 218 # delete_public_link: 'delete public link'
219 download: 'Download' 219 export: 'Esporta'
220 print: 'Stampa' 220 print: 'Stampa'
221 problem: 221 problem:
222 label: 'Problemi?' 222 label: 'Problemi?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 5e983488..8f39ce05 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: 'Corrièl' 216 share_email_label: 'Corrièl'
217 public_link: 'ligam public' 217 public_link: 'ligam public'
218 delete_public_link: 'suprimir lo ligam public' 218 delete_public_link: 'suprimir lo ligam public'
219 download: 'Telecargar' 219 export: 'Exportar'
220 print: 'Imprimir' 220 print: 'Imprimir'
221 problem: 221 problem:
222 label: 'Un problèma ?' 222 label: 'Un problèma ?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index fea90440..a6e0c10f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: 'Adres email' 216 share_email_label: 'Adres email'
217 public_link: 'Publiczny link' 217 public_link: 'Publiczny link'
218 delete_public_link: 'Usuń publiczny link' 218 delete_public_link: 'Usuń publiczny link'
219 download: 'Pobierz' 219 export: 'Export'
220 print: 'Drukuj' 220 print: 'Drukuj'
221 problem: 221 problem:
222 label: 'Problemy' 222 label: 'Problemy'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index c59991f8..a9473591 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: 'E-mail' 216 share_email_label: 'E-mail'
217 public_link: 'link público' 217 public_link: 'link público'
218 delete_public_link: 'apagar link público' 218 delete_public_link: 'apagar link público'
219 download: 'Download' 219 export: 'Exportar'
220 print: 'Imprimir' 220 print: 'Imprimir'
221 problem: 221 problem:
222 label: 'Problemas?' 222 label: 'Problemas?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 5846b7cc..80d78a01 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: 'E-mail' 216 share_email_label: 'E-mail'
217 # public_link: 'public link' 217 # public_link: 'public link'
218 # delete_public_link: 'delete public link' 218 # delete_public_link: 'delete public link'
219 download: 'Descarcă' 219 export: 'Descarcă'
220 # print: 'Print' 220 # print: 'Print'
221 problem: 221 problem:
222 label: 'Probleme?' 222 label: 'Probleme?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 430fb96b..2896c823 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -216,7 +216,7 @@ entry:
216 share_email_label: 'E-posta' 216 share_email_label: 'E-posta'
217 # public_link: 'public link' 217 # public_link: 'public link'
218 # delete_public_link: 'delete public link' 218 # delete_public_link: 'delete public link'
219 download: 'İndir' 219 export: 'Dışa Aktar'
220 # print: 'Print' 220 # print: 'Print'
221 problem: 221 problem:
222 label: 'Bir sorun mu var?' 222 label: 'Bir sorun mu var?'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
index 3430c0d4..b3f0affb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
@@ -14,7 +14,7 @@
14 14
15 <ul> 15 <ul>
16 <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li> 16 <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li>
17 <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li> 17 <li><a href="https://doc.wallabag.org/en/developer/api/readme.html">{{ 'developer.full_documentation'|trans }}</a></li>
18 <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li> 18 <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
19 </ul> 19 </ul>
20 20
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 f82e5dc5..1cd3485c 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
@@ -34,9 +34,10 @@
34 <div id="set2" class="col s12"> 34 <div id="set2" class="col s12">
35 <dl> 35 <dl>
36 <dt>{{ 'about.getting_help.documentation'|trans }}</dt> 36 <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
37 <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd> 37 <dd><a href="https://doc.wallabag.org/en/">english</a></dd>
38 <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd> 38 <dd><a href="https://doc.wallabag.org/fr/">français</a></dd>
39 <dd><a href="http://doc.wallabag.org/de/master/">deutsch</a></dd> 39 <dd><a href="https://doc.wallabag.org/de/">deutsch</a></dd>
40 <dd><a href="https://doc.wallabag.org/it/">italiano</a></dd>
40 41
41 <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> 42 <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
42 <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> 43 <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
@@ -46,7 +47,7 @@
46 <div id="set3" class="col s12"> 47 <div id="set3" class="col s12">
47 <dl> 48 <dl>
48 <dt>{{ 'about.helping.description'|trans }}</dt> 49 <dt>{{ 'about.helping.description'|trans }}</dt>
49 <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd> 50 <dd>{{ 'about.helping.by_contributing'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing_2'|trans }}</a></dd>
50 <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd> 51 <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
51 </dl> 52 </dl>
52 </div> 53 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
index b7a48551..4580813c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
@@ -69,8 +69,8 @@
69 <div class="card-action"> 69 <div class="card-action">
70 <ul> 70 <ul>
71 <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li> 71 <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
72 <li><a href="http://doc.wallabag.org/en/master/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li> 72 <li><a href="https://doc.wallabag.org/en/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li>
73 <li><a href="http://doc.wallabag.org/en/master/index.html#dev-docs">{{ 'quickstart.more'|trans }}</a></li> 73 <li><a href="https://doc.wallabag.org/">{{ 'quickstart.more'|trans }}</a></li>
74 </ul> 74 </ul>
75 </div> 75 </div>
76 </div> 76 </div>
@@ -84,9 +84,9 @@
84 </div> 84 </div>
85 <div class="card-action"> 85 <div class="card-action">
86 <ul> 86 <ul>
87 <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li> 87 <li><a href="https://doc.wallabag.org/en/user/articles/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
88 <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li> 88 <li><a href="https://doc.wallabag.org/en/user/articles/download.html">{{ 'quickstart.docs.export'|trans }}</a></li>
89 <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li> 89 <li><a href="https://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
90 </ul> 90 </ul>
91 </div> 91 </div>
92 </div> 92 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 47e6e8c3..58e08cbc 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -183,7 +183,7 @@
183 <li class="bold"> 183 <li class="bold">
184 <a class="waves-effect collapsible-header"> 184 <a class="waves-effect collapsible-header">
185 <i class="material-icons small">file_download</i> 185 <i class="material-icons small">file_download</i>
186 <span>{{ 'entry.view.left_menu.download'|trans }}</span> 186 <span>{{ 'entry.view.left_menu.export'|trans }}</span>
187 </a> 187 </a>
188 <div class="collapsible-body"> 188 <div class="collapsible-body">
189 <ul> 189 <ul>