Merge pull request #6036 from getkirby/release/4.0.1

4.0.1
getkirby · Nov 30, 2023 · 846dd70 · 846dd70
2 parents 40eae8e + 053e476
commit 846dd70
Show file tree

Hide file tree

Showing 24 changed files with 254 additions and 223 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,15 +6,17 @@
 
 To keep track of different states of our code (current release, bugfixes, features) we use branches:
 
-| Branch      | Used for                                                                 | PRs allowed?                |
-| ----------- | ------------------------------------------------------------------------ | --------------------------- |
-| `main`      | Latest released version                                                  | -                           |
-| `develop`   | Working branch for next release, e.g. `3.7.x`                            | ✅                          |
-| `fix/*`     | Temporary branches for single patch                                      | -                           |
-| `feature/*` | Temporary branches for single feature                                    | -                           |
-| `release/*` | Pre-releases in testing before they are merged into `main` when released | only during release testing |
-
-We will review all pull requests (PRs) to `develop` and merge them if accepted, once an appropriate version is upcoming. Please understand that this might not be the immediate next release and might take some time.
+| Branch          | Used for                                                                 | PRs allowed?                |
+| --------------- | ------------------------------------------------------------------------ | --------------------------- |
+| `main`          | Latest released version                                                  | ❌                           |
+| `develop-patch` | Working branch for next patch release, e.g. `4.0.x`                      | ✅                          |
+| `develop-minor` | Working branch for next minor release, e.g. `4.x.0`                      | ✅                          |
+| `v5/develop`    | Working branch for next major release, e.g. `5.0.0`                      | ✅                          |
+| `fix/*`         | Temporary branches for single bugfix                                     | -                           |
+| `feature/*`     | Temporary branches for single feature                                    | -                           |
+| `release/*`     | Pre-releases in testing before they are merged into `main` when released | only during release testing |
+
+We will review all pull requests (PRs) to `develop-patch`, `develop-minor` and `v5/develop` and merge them if accepted, once an appropriate version is upcoming. Please understand that this might not be the immediate next release and might take some time.
 
 ## How you can contribute
 
@@ -26,25 +28,25 @@ When you find a bug, the first step to fixing it is to help us understand and re
 
 For bug fixes, please create a new branch following the name scheme: `fix/issue_number-bug-x`, e.g. `fix/234-this-nasty-bug`. Limit bug fix PRs to a single bug. **Do not mix multiple bug fixes in a single PR.** This will make it easier for us to review the fix and merge it.
 
-- Always send bug fix PRs against the `develop` branch––not `main`.
+- Always send bug fix PRs against the `develop-patch` branch––not `main`.
 - Add a helpful description of what the PR does if it is not 100% self-explanatory.
 - Every bug fix should include a [unit test](#tests) to avoid future regressions. Let us know if you need help with that.
 - Make sure your code [style](#style) matches ours and includes [comments/in-code documentation](#documentation).
-- Make sure your branch is up to date with the latest state on the `develop` branch. [Rebase](https://help.github.com/articles/about-pull-request-merges/) changes before you send the PR.
+- Make sure your branch is up to date with the latest state on the `develop-patch` branch. [Rebase](https://help.github.com/articles/about-pull-request-merges/) changes before you send the PR.
 - Please *don't* commit updated dist files in the `panel/dist` folder to avoid merge conflicts. We only build the dist files on release. Your branch should only contain changes to the source files.
 
 ### Features
 
 For features create a new branch following the name scheme: `feature/issue_number-feature-x`, e.g. `feature/123-awesome-function`. Our [feedback platform](https://feedback.getkirby.com) can be a good source of highly requested features. Maybe your feature idea already exists and you can get valuable feedback from other Kirby users. Focus on a single feature per PR. Don't mix features!
 
-- Always send feature PRs against the `develop` branch––not `main`.
+- Always send feature PRs against the `develop-minor` branch––not `main`.
 - Add a helpful description of what the PR does.
 - New features should include [unit tests](#tests). Let us know if you need help with that.
 - Make your code [style](#style) matches ours and includes [comments/in-code documentation](#documentation).
-- Make sure your branch is up to date with the latest state on the `develop` branch. [Rebase](https://help.github.com/articles/about-pull-request-merges/) changes before you send the PR.
+- Make sure your branch is up to date with the latest state on the `develop-minor` branch. [Rebase](https://help.github.com/articles/about-pull-request-merges/) changes before you send the PR.
 - Please *don't* commit updated dist files in the `panel/dist` folder to avoid merge conflicts. We only build the dist files on release. Your branch should only contain changes to the source files.
 
-We try to bundle features in our major releases, e.g. `3.x`. That is why we might only review and, if accepted, merge your PR once an appropriate release is upcoming. Please understand that we cannot merge all feature ideas or that it might take a while. Check out the [roadmap](https://roadmap.getkirby.com) to see upcoming releases.
+We try to bundle features in our major releases, e.g. `5.0`. That is why we might only review and, if accepted, merge your PR once an appropriate release is upcoming. Please understand that we cannot merge all feature ideas or that it might take a while. Check out the [roadmap](https://roadmap.getkirby.com) to see upcoming releases.
 
 ### Translations
 

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
 	"description": "The Kirby core",
 	"license": "proprietary",
 	"type": "kirby-cms",
-	"version": "4.0.0",
+	"version": "4.0.1",
 	"keywords": [
 		"kirby",
 		"cms",
@@ -46,7 +46,7 @@
 		"phpmailer/phpmailer": "6.9.1",
 		"symfony/polyfill-intl-idn": "1.28.0",
 		"symfony/polyfill-mbstring": "1.28.0",
-		"symfony/yaml": "6.3.8"
+		"symfony/yaml": "6.4.0"
 	},
 	"replace": {
 		"symfony/polyfill-php72": "*"

diff --git a/composer.lock b/composer.lock
diff --git a/config/areas/files/dialogs.php b/config/areas/files/dialogs.php
@@ -26,7 +26,7 @@
 							'type'      => 'slug',
 							'required'  => true,
 							'icon'      => 'title',
-							'allow'     => '@._-',
+							'allow'     => 'a-z0-9@._-',
 							'after'     => '.' . $file->extension(),
 							'preselect' => true
 						]

diff --git a/i18n/translations/fr.json b/i18n/translations/fr.json
@@ -135,7 +135,7 @@
 
 	"error.license.domain": "Le domaine de la licence est manquant",
 	"error.license.email": "Veuillez saisir un courriel correct",
-	"error.license.format": "Please enter a valid license code",
+	"error.license.format": "Veuillez saisir un numéro licence valide",
 	"error.license.verification": "La licence n’a pu être vérifiée",
 
 	"error.login.totp.confirm.invalid": "Code incorrect",
@@ -425,8 +425,8 @@
 	"license.code.label": "Veuillez saisir votre numéro de licence",
 	"license.status.active.info": "Inclut les nouvelles versions majeures jusqu'au {date}",
 	"license.status.active.label": "Licence valide",
-	"license.status.demo.info": "This is a demo installation",
-	"license.status.demo.label": "Demo",
+	"license.status.demo.info": "Ceci est une installation de démonstration",
+	"license.status.demo.label": "Démonstration",
 	"license.status.inactive.info": "Renouveler la licence pour mettre à jour vers les nouvelles versions majeures",
 	"license.status.inactive.label": "Pas de nouvelles versions majeures",
 	"license.status.legacy.bubble": "Prêt à renouveler votre licence ?",

diff --git a/i18n/translations/it.json b/i18n/translations/it.json
@@ -135,7 +135,7 @@
 
 	"error.license.domain": "Il dominio per la licenza è assente",
 	"error.license.email": "Inserisci un indirizzo email valido",
-	"error.license.format": "Please enter a valid license code",
+	"error.license.format": "Per favore inserisci un codice di licenza valido",
 	"error.license.verification": "Non è stato possibile verificare la licenza",
 
 	"error.login.totp.confirm.invalid": "Codice non valido",
@@ -425,7 +425,7 @@
 	"license.code.label": "Inserisci il codice di licenza",
 	"license.status.active.info": "Comprende nuove versioni major entro il {date}",
 	"license.status.active.label": "Licenza valida",
-	"license.status.demo.info": "This is a demo installation",
+	"license.status.demo.info": "Questa è un'installazione demo",
 	"license.status.demo.label": "Demo",
 	"license.status.inactive.info": "Rinnova la licenza per aggiornare a nuove versioni major",
 	"license.status.inactive.label": "Nessuna nuova versione major",