Merge pull request #6896 from wallabag/prepare-265

Prepare wallabag 2.6.5

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.6.5](https://github.com/wallabag/wallabag/tree/2.6.5)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.4...2.6.5)
+
+### Fixes
+* "Fix checkboxes pointer-events disabled" by @Simounet https://github.com/wallabag/wallabag/pull/6874
+* "Fix nav input styles" by @Simounet https://github.com/wallabag/wallabag/pull/6877
+* "Change domain status filters html types" by @Simounet https://github.com/wallabag/wallabag/pull/6888
+
 ## [2.6.4](https://github.com/wallabag/wallabag/tree/2.6.4)
 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.3...2.6.4)
 

app/Resources/static/themes/material/css/nav.scss

@@ -70,6 +70,7 @@ nav {
 
   .input-field input {
     display: block;
+    font-size: 1.2rem;
     line-height: inherit;
     height: 3rem;
   }
@@ -79,6 +80,17 @@ nav {
     box-shadow: none;
     color: #444;
   }
+
+  /* materializecss override */
+  .input-field.input-field input {
+    margin-bottom: 0;
+    border-bottom: none;
+  }
+
+  .input-field.input-field input:focus {
+    border-bottom: none;
+    box-shadow: initial;
+  }
 }
 
 .nav-panel-top {

app/Resources/static/themes/material/css/various.scss

@@ -15,8 +15,10 @@ div.settings div.file-field {
   }
 }
 
-.input-field label {
-    pointer-events: auto !important;
+/* override materializecss pointer-event disabled on checkboxes */
+[type="checkbox"]:not(:checked),
+[type="checkbox"]:checked {
+  pointer-events: initial;
 }
 
 .input-field label.active {

app/config/wallabag.yml

@@ -1,5 +1,5 @@
 wallabag_core:
-    version: 2.6.4
+    version: 2.6.5
     paypal_url: "https://liberapay.com/wallabag/donate"
     languages:
         en: 'English'

composer.lock

@@ -4582,16 +4582,16 @@
         },
         {
             "name": "j0k3r/graby-site-config",
-            "version": "1.0.173",
+            "version": "1.0.174",
             "source": {
                 "type": "git",
                 "url": "https://github.com/j0k3r/graby-site-config.git",
-                "reference": "e54353732d257639039d358972e8947b5d7f05d2"
+                "reference": "cc9e93b090a475dfc7ec6f77ecccfefc88418ed1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/e54353732d257639039d358972e8947b5d7f05d2",
-                "reference": "e54353732d257639039d358972e8947b5d7f05d2",
+                "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/cc9e93b090a475dfc7ec6f77ecccfefc88418ed1",
+                "reference": "cc9e93b090a475dfc7ec6f77ecccfefc88418ed1",
                 "shasum": ""
             },
             "require": {
@@ -4620,9 +4620,9 @@
             "description": "Graby site config files",
             "support": {
                 "issues": "https://github.com/j0k3r/graby-site-config/issues",
-                "source": "https://github.com/j0k3r/graby-site-config/tree/1.0.173"
+                "source": "https://github.com/j0k3r/graby-site-config/tree/1.0.174"
             },
-            "time": "2023-08-21T09:46:59+00:00"
+            "time": "2023-08-28T08:06:47+00:00"
         },
         {
             "name": "j0k3r/httplug-ssrf-plugin",

src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php

@@ -6,6 +6,7 @@ use Lexik\Bundle\FormFilterBundle\Filter\FilterOperands;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType;
+use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\TextFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
@@ -102,10 +103,13 @@ class EntryFilterType extends AbstractType
                     return $filterQuery->createCondition($expression);
                 },
                 'label' => 'entry.filters.domain_label',
+                'attr' => [
+                    'autocapitalize' => 'off',
+                ],
             ])
-            ->add('httpStatus', TextFilterType::class, [
+            ->add('httpStatus', NumberFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
-                    $value = $values['value'];
+                    $value = (int) $values['value'];
                     if (false === \array_key_exists($value, Response::$statusTexts)) {
                         return false;
                     }
@@ -117,6 +121,11 @@ class EntryFilterType extends AbstractType
                     return $filterQuery->createCondition($expression, $parameters);
                 },
                 'label' => 'entry.filters.http_status_label',
+                'html5' => true,
+                'attr' => [
+                    'min' => 100,
+                    'max' => 527,
+                ],
             ])
             ->add('isArchived', CheckboxFilterType::class, [
                 'label' => 'entry.filters.archived_label',