Luke Towers
|
c047f34156
|
Merge branch 'wip/rebrand-1.0' into wip/rebrand-develop
# Conflicts:
# .github/workflows/code-quality-pr.yaml
# .github/workflows/code-quality-push.yaml
# .github/workflows/tests.yml
# README.md
# composer.json
# modules/backend/behaviors/ImportExportController.php
# modules/backend/behaviors/ReorderController.php
# modules/backend/composer.json
# modules/backend/models/ExportModel.php
# modules/cms/ServiceProvider.php
# modules/cms/classes/Asset.php
# modules/cms/classes/CmsObject.php
# modules/cms/classes/CmsObjectCollection.php
# modules/cms/composer.json
# modules/system/ServiceProvider.php
# modules/system/aliases.php
# modules/system/assets/js/lang/lang.es.js
# modules/system/assets/js/lang/lang.it.js
# modules/system/assets/js/lang/lang.zh-tw.js
# modules/system/assets/ui/storm-min.js
# modules/system/classes/CombineAssets.php
# modules/system/classes/ErrorHandler.php
# modules/system/classes/SystemController.php
# modules/system/classes/UpdateManager.php
# modules/system/composer.json
# modules/system/console/WinterFresh.php
# modules/system/console/WinterUtil.php
# modules/system/controllers/updates/_list_toolbar.htm
# modules/system/providers.php
# tests/UiTestCase.php
# tests/functional/backend/AuthTest.php
# tests/functional/phpunit.xml
# tests/unit/backend/classes/NavigationManagerTest.php
# tests/unit/cms/classes/CmsObjectTest.php
# tests/unit/cms/classes/ControllerTest.php
# tests/unit/cms/classes/ThemeTest.php
# tests/unit/plugins/database/PluginModelTest.php
# tests/unit/plugins/database/ValidationModelTest.php
# tests/unit/system/console/WinterEnvTest.php
|
2021-03-11 00:22:09 -06:00 |
|
Luke Towers
|
32d0702f11
|
Added missing registerAssetBundles() method
|
2021-03-10 23:32:08 -06:00 |
|
Luke Towers
|
cfa763b714
|
Initial rebrand commit generated from the 1.0 rebrand branch patch file
|
2021-03-10 15:02:53 -06:00 |
|
Luke Towers
|
a77e8b3b66
|
Add support for NavigationManager owner aliasing.
Written by @jaxwilko in #4
|
2021-03-09 14:12:25 -06:00 |
|
Ben Thomson
|
c7ab3837a6
|
Hopefully finally fix code quality checks
|
2021-03-08 22:47:34 +08:00 |
|
Ben Thomson
|
1f9d04a579
|
Fix code quality checks in 1.0
|
2021-03-08 22:42:00 +08:00 |
|
Ben Thomson
|
66d5d89017
|
Enusre PHP version is shown in CI actions
|
2021-03-08 17:40:08 +08:00 |
|
Ben Thomson
|
5ccae0990f
|
Cancel previous incomplete workflows, force Composer 1 for 1.0 branch
|
2021-03-08 17:29:12 +08:00 |
|
Ben Thomson
|
3022591080
|
Fix mispelling
|
2021-03-08 17:26:06 +08:00 |
|
Ben Thomson
|
1c7da5b51a
|
Fix testing structure for 1.0
|
2021-03-08 17:24:29 +08:00 |
|
Ben Thomson
|
2ea05585d5
|
Ensure Zip library is installed
|
2021-03-08 17:19:04 +08:00 |
|
Luke Towers
|
3fd94045d6
|
fix vendor path
|
2021-03-08 03:15:28 -06:00 |
|
Luke Towers
|
61ecd3c34d
|
fix links to storm library
|
2021-03-08 03:07:44 -06:00 |
|
Luke Towers
|
3e6055a425
|
Remove files present in the org .github repo
|
2021-03-06 16:24:46 -06:00 |
|
Ben Thomson
|
d2c8102bbb
|
Ensure zip extension is installed for CI tests
|
2021-03-06 19:43:07 +08:00 |
|
Luke Towers
|
7d80b771fe
|
Initial work on Winter rebrand for 1.0 branch
|
2021-03-06 04:06:19 -06:00 |
|
Ben Thomson
|
c71e1e3e69
|
Remove experimental flag
|
2021-03-01 23:17:25 +08:00 |
|
Ben Thomson
|
4f5d5426ec
|
Test PHP 8 on both Linux and Windows
|
2021-03-01 23:14:22 +08:00 |
|
Ben Thomson
|
09b07dcbab
|
Merge remote-tracking branch 'origin/develop' into wip/php-8-testing
|
2021-03-01 22:39:35 +08:00 |
|
Ben Thomson
|
6be9bca5e1
|
Remove duplicated word
|
2021-02-22 11:26:44 +08:00 |
|
Luke Towers
|
0311203776
|
Consistency
|
2021-02-21 09:58:10 -06:00 |
|
Luke Towers
|
e3cf0e5843
|
Improvements to the contribution guide
|
2021-02-21 09:57:42 -06:00 |
|
Ben Thomson
|
3939d2e493
|
Merge branch 'develop' into wip/php-8-testing
|
2021-01-14 10:29:34 +08:00 |
|
Luke Towers
|
e5732b575b
|
fix tests
|
2021-01-04 17:22:33 -06:00 |
|
Luke Towers
|
3f5dcde710
|
Fix tests by using composer v1
|
2021-01-04 17:17:39 -06:00 |
|
Luke Towers
|
0d2b2018a0
|
Grammar tweak
|
2020-12-26 17:52:45 -06:00 |
|
Ayumi
|
cd8af27213
|
Update CONTRIBUTING to explain about compiling JS assets (#5432)
|
2020-12-26 09:25:59 +08:00 |
|
Ben Thomson
|
3a8d504384
|
Fix unit tests (#5374)
|
2020-12-08 15:33:23 +08:00 |
|
Ben Thomson
|
8c74db68de
|
Further fixes
|
2020-11-20 11:32:43 +08:00 |
|
Ben Thomson
|
24ac7394b9
|
Remove second include
|
2020-11-20 11:29:27 +08:00 |
|
Ben Thomson
|
22e2ee57b9
|
Fix YAML formatting
|
2020-11-20 11:28:30 +08:00 |
|
Ben Thomson
|
99a894ba01
|
Run tests on PHP 8
These tests will be allowed to fail for now, as we don't officially support PHP 8.
|
2020-11-20 11:24:10 +08:00 |
|
Ben Thomson
|
38a21365db
|
Change branches to test code quality on push
|
2020-10-25 09:54:41 +08:00 |
|
Ben Thomson
|
ccd75e3e9c
|
Fix Composer constraint in tests, test 1.0, 1.1 and develop branches
|
2020-10-25 09:52:34 +08:00 |
|
Ben Thomson
|
34e9bea7cb
|
Force Composer v1 to be installed for tests
Until such a time that `wikimedia/composer-merge-plugin` supports Composer 2.
Refs: https://github.com/octobercms/october/pull/5330#issuecomment-715988820
|
2020-10-25 09:50:13 +08:00 |
|
Ben Thomson
|
a6fca1e317
|
Disable automatic running of scripts in Composer during tests
|
2020-08-14 08:26:23 +08:00 |
|
Ben Thomson
|
c7ed0ffa1a
|
Implement improved testing procedure (#5238)
Refs: 5feb7b872f
|
2020-08-14 08:00:39 +08:00 |
|
Luke Towers
|
cbd30af543
|
Merge branch 'develop' into wip/laravel-6
|
2020-08-09 03:12:18 -06:00 |
|
Ben Thomson
|
46b0389678
|
Remove IRC link.
|
2020-08-07 15:56:42 +08:00 |
|
Ben Thomson
|
69fef086cb
|
Add Discord to our contributor guidelines, minor tweaks
|
2020-08-07 15:52:55 +08:00 |
|
Luke Towers
|
9c6c6b5a12
|
Merge branch 'develop' into wip/laravel-6
|
2020-06-17 03:37:55 -06:00 |
|
Ben Thomson
|
b7d9bd1ca6
|
Remove Subsplit from repo
|
2020-06-12 11:52:28 +08:00 |
|
Luke Towers
|
ad69711634
|
Merge branch 'develop' into wip/laravel-6
|
2020-06-11 10:38:29 -06:00 |
|
Ben Thomson
|
c3800c4196
|
Switch to checkout-v1, v2 is doing something wrong with auth
|
2020-06-11 13:24:46 +08:00 |
|
Ben Thomson
|
5d66b74378
|
Fix auth for subsplit on checkout-v2
|
2020-06-11 13:21:47 +08:00 |
|
Ben Thomson
|
78a6a6e126
|
Finalise subsplit action
|
2020-06-11 13:15:43 +08:00 |
|
Ben Thomson
|
32b0ad3bba
|
Test full subsplit
|
2020-06-11 13:02:03 +08:00 |
|
Ben Thomson
|
2948ee93e4
|
Live test of Subsplit (System Module only)
|
2020-06-11 12:59:42 +08:00 |
|
Ben Thomson
|
d7cdefbba6
|
Fix subsplit repo URL
|
2020-06-11 12:56:24 +08:00 |
|
Ben Thomson
|
61af4f8d9e
|
Debugging split
|
2020-06-11 12:42:46 +08:00 |
|