diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml index a64a50607..be7fc6710 100644 --- a/.github/workflows/archive.yml +++ b/.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' diff --git a/.github/workflows/wrong-branch-notification.yaml b/.github/workflows/wrong-branch-notification.yaml deleted file mode 100644 index aaa431602..000000000 --- a/.github/workflows/wrong-branch-notification.yaml +++ /dev/null @@ -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 diff --git a/config/app.php b/config/app.php index e0c727196..6d6b8dee2 100644 --- a/config/app.php +++ b/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', diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php index f87c136ae..1695adc54 100644 --- a/modules/system/ServiceProvider.php +++ b/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']; /* diff --git a/modules/system/assets/js/updates/install.js b/modules/system/assets/js/updates/install.js index a68ef29ca..b3cde40e1 100644 --- a/modules/system/assets/js/updates/install.js +++ b/modules/system/assets/js/updates/install.js @@ -44,7 +44,7 @@ var template = [ '
', '
', - '
{{name}}
', + '
{{name}} by {{author}}
', '
{{description}}
', '
' ].join('') diff --git a/modules/system/assets/ui/less/site.normalize.less b/modules/system/assets/ui/less/site.normalize.less index d40b1a822..5cda25032 100644 --- a/modules/system/assets/ui/less/site.normalize.less +++ b/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 */ // diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 6e0e23340..ec4263b9e 100644 --- a/modules/system/assets/ui/storm.css +++ b/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,