Merge branch 'release/1.10.40'

getgrav · Mar 22, 2023 · 3b88214 · 3b88214
2 parents bd81411 + ec15e65
commit 3b88214
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 11 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+      interval: "weekly"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# v1.10.40
+## 03/22/2023
+
+1. [](#new)
+   * Added Github actions for dependabot [#2258](https://github.com/getgrav/grav-plugin-admin/pull/2258)
+1. [](#improved)
+   * Syslog tag fields label added [#2296](https://github.com/getgrav/grav-plugin-admin/pull/2296)
+   * Updated vendor libraries to the latest versions
+1. [](#bugfix)
+   * Fix more than one file upload [#2317](https://github.com/getgrav/grav-plugin-admin/pull/2317)
+
 # v1.10.39
 ## 02/19/2023
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Admin Panel
 slug: admin
 type: plugin
-version: 1.10.39
+version: 1.10.40
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

diff --git a/composer.lock b/composer.lock
diff --git a/languages/en.yaml b/languages/en.yaml
@@ -440,6 +440,8 @@ PLUGIN_ADMIN:
   LOG_HANDLER_HELP: "Where to output the logs"
   SYSLOG_FACILITY: "Syslog facility"
   SYSLOG_FACILITY_HELP: "Syslog facility for output"
+  SYSLOG_TAG: "Syslog tag"
+  SYSLOG_TAG_HELP: "Syslog tag for output"
   DEBUGGER: "Debugger"
   DEBUGGER_HELP: "Enable Grav debugger and following settings"
   DEBUG_TWIG: "Debug Twig"

diff --git a/themes/grav/css-compiled/template.css b/themes/grav/css-compiled/template.css
diff --git a/themes/grav/scss/template/_admin.scss b/themes/grav/scss/template/_admin.scss
@@ -332,7 +332,7 @@ $content-padding: 1.5rem;
         object-fit: cover;
     }
 
-    & ~ .block-file {
+    & + .block-file {
         margin-top: -5rem !important;
     }
 }

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'getgrav/grav-plugin-admin',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
-        'reference' => '0d16602880413bb6cbc2c94b75f02dce3174d215',
+        'reference' => '5f1b3e1e4a413bf5e45e99b8d5aa174b6806c12c',
         'type' => 'grav-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'getgrav/grav-plugin-admin' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => '0d16602880413bb6cbc2c94b75f02dce3174d215',
+            'reference' => '5f1b3e1e4a413bf5e45e99b8d5aa174b6806c12c',
             'type' => 'grav-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),