Merge pull request #2694 from getkirby/release/3.4.0

3.4.0

.github/CONTRIBUTING.md

@@ -26,6 +26,10 @@ Make sure your branch is up to date with the latest state on the `develop` branc
 
 Fix code style issues with [PHP CS](https://github.com/FriendsOfPHP/PHP-CS-Fixer) before you submit the PR. [Install PHP CS globally](https://github.com/FriendsOfPHP/PHP-CS-Fixer#globally-composer) via composer and then run `composer fix` in the kirby repository. Our tests will fail if there are CS issues in your code.
 
+## Translations
+
+We are really happy about any help with our translations. Please, do not translate directly in the JSON files though. We use a service called Transifex to handle all languages for the Panel: https://www.transifex.com/getkirby/panel/ Create an account there and send us a request to join our translator group. Please, also send us an email at <support@getkirby.com>. Unfortunately, we don't get notified properly about new translator requests and often miss them.
+
 ## Features
 
 Create feature PRs on a new feature branch. Follow the branch name scheme: `feature/issue_number-feature-x`. Always send feature PRs to the `develop` branch––not `master`!

.github/ISSUE_TEMPLATE/bug_report.md

@@ -21,20 +21,20 @@ Steps to reproduce the behavior:
 <!-- If applicable, add screenshots to help explain your problem. -->
 
 **Kirby Version**  
-<!-- Add the Kirby version you are using. You can find the version number in `kirby/composer.json` or in the  settings view of the panel. -->
+<!-- Add the Kirby version you are using. You can find the version number in `kirby/composer.json` or in the settings view of the Panel. -->
 
 **Console output**  
-<!-- If you are working with the panel, please check the browser console for errors and send the output. -->
+<!-- If you are working with the Panel, please check the browser console for errors and send the output. -->
 
 **Desktop (please complete the following information):**  
  - OS: <!-- e.g. macOS -->
- - Browser: <!-- e.g. chrome, safari -->
+ - Browser: <!-- e.g. Chrome, Safari -->
  - Version: <!-- e.g. 22 -->
 
 **Smartphone (please complete the following information):**  
- - Device: <!-- e.g. iPhone11 -->
- - OS: <!-- e.g. iOS12.1 -->
- - Browser: <!-- e.g. stock browser, safari -->
+ - Device: <!-- e.g. iPhone 11 -->
+ - OS: <!-- e.g. iOS 13.3 -->
+ - Browser: <!-- e.g. stock browser, Safari -->
  - Version: <!-- e.g. 22 -->
 
 **Additional context**  

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,7 +4,7 @@
 
 ## Related issues
 
-<!-- PR relates to issues in the `kirby` or `idea` repo: -->
+<!-- PR relates to issues in the `kirby` or `ideas` repo: -->
 
 - Fixes #
 

.github/README.md

@@ -13,15 +13,18 @@ This is Kirby's core application folder. Get started with one of the following r
 
 ## Contribute
 
-**Bug reports**  
+### Bug reports
 Please post all bug reports in our [issue tracker](https://github.com/getkirby/kirby/issues).
 
-**Contributing guidelines**  
+### Contributing guidelines
 Read about how to contribute to the development in our [contributing guide](/.github/CONTRIBUTING.md).
 
-**Feature suggestions**  
+### Feature suggestions
 If you want to suggest features or enhancements for Kirby, please use our [ideas repository](https://github.com/getkirby/ideas/issues).
 
+### Translations
+We are really happy about any help with our translations. Please, do not translate directly in the JSON files though. We use a service called Transifex to handle all languages for the Panel: https://www.transifex.com/getkirby/panel/ Create an account there and send us a request to join our translator group. Please, also send us an email at <support@getkirby.com>. Unfortunately, we don't get notified properly about new translator requests and often miss them.
+
 ## License
 
 Kirby is not free software. In order to run Kirby on a public server you must purchase a valid license.

SECURITY.md

@@ -1,16 +1,3 @@
 # Security Policy
 
-## Supported Versions
-
-| Version  | Supported          |
-| -------  | ------------------ |
-| 3.2.3+   | :white_check_mark: |
-| 2.5.12+  | :white_check_mark: |
-
-## Security Guide
-
-Please follow our security guide to keep your Kirby installation safe: https://getkirby.com/docs/guide/security#reporting-security-issues 
-
-## Reporting a Vulnerability
-
-If you have spotted a vulnerability in Kirby's core or the Panel, please make sure to let us know immediately. We take any report very seriously. You can always write us directly at support@getkirby.com. Please do not write to us publicly, e.g. in the forum.
+Please see the [Security Policy on the Kirby website](https://getkirby.com/security) for a list of the currently supported Kirby versions and of past security incidents as well as for information on how to report security vulnerabilities in the Kirby core or in the Panel.

assets/whoops.css

@@ -0,0 +1,83 @@
+body {
+  background: #efefef;
+  font: normal normal 400 12px/1.5 -apple-system, BlinkMacSystemFont, Segoe UI,
+    Roboto, Helvetica, Arial, sans-serif;
+}
+
+.left-panel {
+  background: transparent;
+}
+
+header {
+  background-color: #313740;
+}
+
+.exc-title-primary {
+  color: hsl(0, 71%, 55%);
+}
+
+.frame.active {
+  color: hsl(0, 71%, 55%);
+  box-shadow: inset -5px 0 0 0 #d16464;
+}
+
+.frame:not(.active):hover {
+  background: rgba(203, 215, 229, 0.5);
+}
+
+.rightButton {
+  color: #999;
+  box-shadow: inset 0 0 0 1px #777;
+  border-radius: 0;
+}
+
+.rightButton:hover {
+  box-shadow: inset 0 0 0 1px #555;
+  color: #777;
+}
+
+.details-heading {
+  color: #7e9abf;
+  font-weight: 500;
+}
+
+.frame-code {
+  background: #000;
+}
+
+pre.code-block,
+code.code-block,
+.frame-args.code-block,
+.frame-args.code-block samp {
+  background: #16171a;
+}
+
+.linenums li.current {
+  background: transparent;
+}
+
+.linenums li.current.active {
+  background: rgba(209, 100, 100, 0.3);
+}
+
+pre .atv,
+code .atv,
+pre .str,
+code .str {
+  color: #a7bd68;
+}
+
+pre .tag,
+code .tag {
+  color: #d16464;
+}
+
+pre .kwd,
+code .kwd {
+  color: #8abeb7;
+}
+
+pre .atn,
+code .atn {
+  color: #de935f;
+}

bootstrap.php

@@ -2,9 +2,12 @@
 
 /**
  * Validate the PHP version to already
- * stop at older versions
+ * stop at older or too recent versions
  */
-if (version_compare(phpversion(), '7.1.0', '>=') === false) {
+if (
+    version_compare(PHP_VERSION, '7.2.0', '>=') === false ||
+    version_compare(PHP_VERSION, '7.5.0', '<')  === false
+) {
     die(include __DIR__ . '/views/php.php');
 }