Merge branch 'develop' into wip/laravel-6

.github/workflows/archive.yml

@@ -16,13 +16,15 @@ jobs:
         stale-issue-message: >
           This issue will be closed and archived in 3 days, as there has been no activity in the last 30 days.
 
-          - If this issue is still relevant or you would like to see it actioned, please respond and we will re-open this issue.
-          - If this issue is critical to your business, consider joining the [Premium Support Program](https://octobercms.com/premium-support) where a Service Level Agreement is offered.
+          If this issue is still relevant or you would like to see it actioned, please respond and we will re-open this issue.
+          
+          If this issue is critical to your business, consider joining the [Premium Support Program](https://octobercms.com/premium-support) where a Service Level Agreement is offered.
         stale-pr-message: >
           This pull request will be closed and archived in 3 days, as there has been no activity in the last 30 days.
 
-          - If this is still being worked on, please respond and we will re-open this pull request.
-          - If this pull request is critical to your business, consider joining the [Premium Support Program](https://octobercms.com/premium-support) where a Service Level Agreement is offered.
+          If this is still being worked on, please respond and we will re-open this pull request.
+          
+          If this pull request is critical to your business, consider joining the [Premium Support Program](https://octobercms.com/premium-support) where a Service Level Agreement is offered.
         stale-issue-label: 'Status: Archived'
         stale-pr-label: 'Status: Archived'
         exempt-issue-label: 'Status: In Progress'

.github/workflows/wrong-branch-notification.yaml

@@ -1,21 +0,0 @@
-name: Wrong Branch
-
-on:
-  pull_request:
-    types: [opened]
-    branches:
-      - master
-
-jobs:
-  wrongBranch:
-    runs-on: ubuntu-latest
-    name: Fix Wrong Branch
-    steps:
-      - name: Alert submitter
-        run: |
-          export ISSUE_NUMBER=$(echo '${{ github.ref }}' | cut -d'/' -f3)
-          curl -s --request POST --url https://api.github.com/repos/${{ github.repository }}/issues/${ISSUE_NUMBER}/comments --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' --header 'content-type: application/json' --data '{"body": "This pull request has been made to the wrong branch. Please review [the contributing guidelines](https://github.com/octobercms/october/blob/master/.github/CONTRIBUTING.md#making-a-pull-request) as all PRs need to be made to the `develop` branch.\n\nWe'\''ll fix it for you this time, but please ensure you make any future PRs to the `develop` branch, not the `master` branch."}' > /dev/null
-      - name: Change base branch
-        run: |
-          export ISSUE_NUMBER=$(echo '${{ github.ref }}' | cut -d'/' -f3)
-          curl -s --request PATCH --url https://api.github.com/repos/${{ github.repository }}/pulls/${ISSUE_NUMBER} --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' --header 'content-type: application/json' --data '{"base": "develop"}' > /dev/null

config/app.php

@@ -73,6 +73,12 @@ return [
     | by the translation service provider. You are free to set this value
     | to any of the locales which will be supported by the application.
     |
+    | WARNING: Avoid setting this to a locale that is not supported by the
+    | backend yet, as this can cause issues in the backend.
+    |
+    | Currently supported backend locales are listed in
+    | Backend\Models\Preference->getLocaleOptions())
+    |
     */
 
     'locale' => 'en',

modules/system/ServiceProvider.php

@@ -132,7 +132,7 @@ class ServiceProvider extends ModuleServiceProvider
      */
     protected function registerPrivilegedActions()
     {
-        $requests = ['/combine', '@/system/updates', '@/system/install', '@/backend/auth'];
+        $requests = ['/combine/', '@/system/updates', '@/system/install', '@/backend/auth'];
         $commands = ['october:up', 'october:update'];
 
         /*

modules/system/assets/js/updates/install.js

@@ -44,7 +44,7 @@
         var template = [
             '<div class="product-details">',
             '<div class="product-image"><img src="{{image}}" alt=""></div>',
-            '<div class="product-name ">{{name}}</div>',
+            '<div class="product-name ">{{name}} by {{author}}</div>',
             '<div class="product-description text-overflow">{{description}}</div>',
             '</div>'
         ].join('')

modules/system/assets/ui/less/site.normalize.less

@@ -1,3 +1,13 @@
+/*! Make focus ring standard on every browser */
+
+// See github issue https://github.com/octobercms/october/issues/4892
+
+&:focus {
+    outline: none;
+    -webkit-box-shadow: inset 0 1px 2px rgba(27,31,35,.075), 0 0 0 0.2em rgba(3,102,214,.3);
+    box-shadow: inset 0 1px 2px rgba(27,31,35,.075), 0 0 0 0.2em rgba(3,102,214,.3);
+}
+
 /*! normalize.css v3.0.0 | MIT License | git.io/normalize */
 
 //

modules/system/assets/ui/storm.css

@@ -1,3 +1,4 @@
+:focus {outline:none;-webkit-box-shadow:inset 0 1px 2px rgba(27,31,35,.075),0 0 0 .2em rgba(3,102,214,.3);box-shadow:inset 0 1px 2px rgba(27,31,35,.075),0 0 0 .2em rgba(3,102,214,.3)}
 html {font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
 body {margin:0}
 article,