Merge pull request #2365 from getkirby/release/3.3.2

3.3.2
getkirby · Dec 17, 2019 · 6bd14bc · 6bd14bc
2 parents 785e941 + 18172f3
commit 6bd14bc
Show file tree

Hide file tree

Showing 55 changed files with 738 additions and 336 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@
 /.idea
 
 # tests
+.phpunit.result.cache
 /panel/cypress
 /tests/coverage
 

diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,7 @@ services:
 php:
   - 7.2
   - 7.3
-  - 7.4snapshot
-jobs:
-  allow_failures:
-  - php: 7.4snapshot
+  - 7.4
 
 before_install:
   # set up PHP config
@@ -23,7 +20,7 @@ before_install:
 
 install:
   # install Composer packages, will also trigger dump-autoload
-  - composer require -n --ignore-platform-reqs "phwoolcon/ci-pecl-cacher" "phpunit/phpunit:^7" "pcov/clobber" "friendsofphp/php-cs-fixer" "php-coveralls/php-coveralls"
+  - composer require -n --ignore-platform-reqs "phwoolcon/ci-pecl-cacher" "phpunit/phpunit:^8" "friendsofphp/php-cs-fixer" "php-coveralls/php-coveralls"
   - composer install -n --ignore-platform-reqs --no-suggest
 
   # install and cache PHP extensions
@@ -32,7 +29,6 @@ install:
 
 before_script:
   - mkdir -p build/logs
-  - ./vendor/bin/pcov clobber
   - ls -al
 
 script:

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "getkirby/cms",
   "description": "The Kirby 3 core",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "license": "proprietary",
   "keywords": ["kirby", "cms", "core"],
   "homepage": "https://getkirby.com",

diff --git a/composer.lock b/composer.lock
diff --git a/i18n/translations/es_419.json b/i18n/translations/es_419.json
@@ -438,12 +438,12 @@
   "upload.error.default": "El archivo no pudo ser subido",
   "upload.error.extension": "Subida de archivo detenida por la extensión",
   "upload.error.formSize": "El archivo subido excede la directiva MAX_FILE_SIZE que fue especificada en el formulario",
-  "upload.error.iniPostSize": "The uploaded file exceeds the post_max_size directive in php.ini",
-  "upload.error.iniSize": "The uploaded file exceeds the upload_max_filesize directive in php.ini",
-  "upload.error.noFile": "No file was uploaded",
-  "upload.error.noFiles": "No files were uploaded",
-  "upload.error.partial": "The uploaded file was only partially uploaded",
-  "upload.error.tmpDir": "Missing a temporary folder",
+  "upload.error.iniPostSize": "El archivo subido excede la directiva post_max_size directive en php.ini",
+  "upload.error.iniSize": "El archivo subido excede la directiva upload_max_filesize en php.ini",
+  "upload.error.noFile": "Ningún archivo ha sido subido",
+  "upload.error.noFiles": "Ningún archivo ha sido subido",
+  "upload.error.partial": "El archivo ha sido subido solo parcialmente",
+  "upload.error.tmpDir": "No se encuentra la carpeta temporal",
   "upload.errors": "Error",
   "upload.progress": "Subiendo...",
 

diff --git a/i18n/translations/es_ES.json b/i18n/translations/es_ES.json
@@ -23,15 +23,15 @@
 
   "delete": "Borrar",
   "dimensions": "Dimensiones",
-  "disabled": "Disabled",
+  "disabled": "Desabilitado",
   "discard": "Descartar",
-  "download": "Download",
-  "duplicate": "Duplicate",
+  "download": "Descargar",
+  "duplicate": "Duplicar",
   "edit": "Editar",
 
-  "dialog.files.empty": "No files to select",
-  "dialog.pages.empty": "No pages to select",
-  "dialog.users.empty": "No users to select",
+  "dialog.files.empty": "No se ha seleccionado ningún archivo",
+  "dialog.pages.empty": "No se ha seleccionado ninguna página",
+  "dialog.users.empty": "No se ha seleccionado ningún usuario",
 
   "email": "Correo electrónico",
   "email.placeholder": "[email protected]",

diff --git a/i18n/translations/sv_SE.json b/i18n/translations/sv_SE.json
@@ -61,21 +61,21 @@
     "Filändelsen \"{extension}\" är inte tillåten",
   "error.file.extension.missing":
     "Filen \"{filename}\" saknar filändelse",
-  "error.file.maxheight": "The height of the image must not exceed {height} pixels",
-  "error.file.maxsize": "The file is too large",
-  "error.file.maxwidth": "The width of the image must not exceed {width} pixels",
+  "error.file.maxheight": "Bildens höjd får inte överstiga {height} pixlar",
+  "error.file.maxsize": "Filen är för stor",
+  "error.file.maxwidth": "Bildens bredd får inte överstiga {width} pixlar",
   "error.file.mime.differs":
     "Den uppladdade filen måste vara av samma mime-typ \"{mime}\"",
   "error.file.mime.forbidden": "Mediatypen \"{mime}\" är inte tillåten",
-  "error.file.mime.invalid": "Invalid mime type: {mime}",
+  "error.file.mime.invalid": "Ogiltig mime-typ: {mime}",
   "error.file.mime.missing":
     "Mediatypen för \"{filename}\" kan inte detekteras",
-  "error.file.minheight": "The height of the image must be at least {height} pixels",
-  "error.file.minsize": "The file is too small",
-  "error.file.minwidth": "The width of the image must be at least {width} pixels",
+  "error.file.minheight": "Bildens höjd måste vara minst {height} pixlar",
+  "error.file.minsize": "Filen är för liten",
+  "error.file.minwidth": "Bildens bredd måste vara minst {width} pixlar",
   "error.file.name.missing": "Filnamnet får inte vara tomt",
   "error.file.notFound": "Filen  \"{filename}\" kan ej hittas",
-  "error.file.orientation": "The orientation of the image must be \"{orientation}\"",
+  "error.file.orientation": "Bildens orientering måste vara \"{orientation}\"",
   "error.file.type.forbidden": "Du har inte behörighet att ladda upp filer av typen {type}",
   "error.file.undefined": "Filen kan inte hittas",
 
@@ -304,7 +304,7 @@
   "loading": "Laddar",
 
   "lock.unsaved": "Osparade ändringar",
-  "lock.unsaved.empty": "There are no more unsaved changes",
+  "lock.unsaved.empty": "Det finns inga fler osparade ändringar",
   "lock.isLocked": "Osparade ändringar av <strong>{email}</strong>",
   "lock.file.isLocked": "Filen redigeras just nu av {email} och kan inte redigeras.",
   "lock.page.isLocked": "Sidan redigeras just nu av {email} och kan inte redigeras.",

diff --git a/panel/dist/css/app.css b/panel/dist/css/app.css
diff --git a/panel/dist/js/app.js b/panel/dist/js/app.js
diff --git a/panel/src/components/Forms/Field/MultiselectField.vue b/panel/src/components/Forms/Field/MultiselectField.vue
@@ -6,7 +6,6 @@
     class="k-multiselect-field"
     @blur="blur"
     @keydown.native.enter.prevent="focus"
-    @keydown.native.space.prevent="focus"
   >
     <k-input
       ref="input"

diff --git a/panel/src/components/Forms/Field/StructureField.vue b/panel/src/components/Forms/Field/StructureField.vue
@@ -586,6 +586,7 @@ export default {
 $structure-item-height: 38px;
 
 .k-structure-table {
+  position: relative;
   table-layout: fixed;
   width: 100%;
   background: #fff;
@@ -610,7 +611,14 @@ $structure-item-height: 38px;
   }
 
   th {
+    position: sticky;
+    top: 0;
+    right: 0;
+    left: 0;
+    width: 100%;
+    background: #fff;
     font-weight: 400;
+    z-index: 1;
     color: $color-dark-grey;
     padding: 0 0.75rem;
     height: $structure-item-height;

diff --git a/panel/src/components/Forms/Input/TextInput.vue b/panel/src/components/Forms/Input/TextInput.vue
@@ -97,7 +97,7 @@ export default {
   },
   validations() {
     const match = (value) => {
-      return (!this.required && value.length === 0) || !this.$refs.input.validity.patternMismatch;
+      return (!this.required && !value) || !this.$refs.input.validity.patternMismatch;
     };
 
     return {
@@ -107,7 +107,7 @@ export default {
         maxLength: this.maxlength ? maxLength(this.maxlength) : true,
         email: this.type === "email" ? email : true,
         url: this.type === "url" ? url : true,
-        pattern: this.pattern ? match: true,
+        pattern: this.pattern ? match : true,
       }
     };
   }

diff --git a/panel/src/components/Layout/Card.vue b/panel/src/components/Layout/Card.vue
@@ -62,7 +62,7 @@ export default {
     },
     image: Object,
     info: String,
-    link: String,
+    link: [String, Function],
     options: [Array, Function],
     sortable: Boolean,
     target: String,

diff --git a/panel/src/components/Layout/ListItem.vue b/panel/src/components/Layout/ListItem.vue
@@ -66,7 +66,7 @@ export default {
     text: String,
     target: String,
     info: String,
-    link: String,
+    link: [String, Function],
     flag: Object,
     options: [Array, Function]
   },

diff --git a/panel/src/components/Navigation/Link.vue b/panel/src/components/Navigation/Link.vue
@@ -33,7 +33,7 @@ export default {
     tabindex: [String, Number],
     target: String,
     title: String,
-    to: String,
+    to: [String, Function],
   },
   data() {
     return {
@@ -46,9 +46,14 @@ export default {
   },
   computed: {
     href() {
+      if (typeof this.to === "function") {
+        return '';
+      }
+
       if (this.$route !== undefined && this.to[0] === '/' && !this.target) {
         return (this.$router.options.url || '') + this.to;
       }
+
       return this.to;
     }
   },
@@ -87,6 +92,11 @@ export default {
         return false;
       }
 
+      if (typeof this.to === "function") {
+        event.preventDefault();
+        this.to();
+      }
+
       if (this.isRoutable(event)) {
         event.preventDefault();
         this.$router.push(this.to);

diff --git a/panel/src/components/Views/SettingsView.vue b/panel/src/components/Views/SettingsView.vue
@@ -115,6 +115,9 @@ export default {
               icon: { type: "globe", back: "black" },
               text: language.name,
               info: language.code,
+              link: () => {
+                this.$refs.update.open(language.code);
+              },
               options: [
                 {
                   icon: "edit",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,13 +2,9 @@
 
 <phpunit
     bootstrap="tests/bootstrap.php"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    stopOnFailure="true"
-    stderr="true"
     colors="true"
-    verbose="true">
+    verbose="true"
+    stderr="true">
 
     <filter>
         <whitelist>