From 28ed01cab8df0de60220abef2ac6ad35a8366af6 Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Fri, 1 May 2020 12:05:08 +0800 Subject: [PATCH 1/7] Change archive to 60 days --- .github/workflows/archive.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml index be7fc6710..bbebabf44 100644 --- a/.github/workflows/archive.yml +++ b/.github/workflows/archive.yml @@ -8,24 +8,24 @@ jobs: archive: runs-on: ubuntu-latest steps: - - uses: actions/stale@v1 + - uses: actions/stale@v1.1.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - days-before-stale: 30 + days-before-stale: 60 days-before-close: 3 stale-issue-message: > - This issue will be closed and archived in 3 days, as there has been no activity in the last 30 days. + This issue will be closed and archived in 3 days, as there has been no activity in the last 60 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. 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. + This pull request will be closed and archived in 3 days, as there has been no activity in the last 60 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. stale-issue-label: 'Status: Archived' stale-pr-label: 'Status: Archived' - exempt-issue-label: 'Status: In Progress' - exempt-pr-label: 'Status: In Progress' + exempt-issue-label: 'Status: In Progress,Status: On Hold,Status: Blocked' + exempt-pr-label: 'Status: In Progress,Status: On Hold,Status: Blocked' From 54d42cbcbca4896db5a9fdf37a8c819976149140 Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Fri, 1 May 2020 12:08:26 +0800 Subject: [PATCH 2/7] Use plural for exempt labels --- .github/workflows/archive.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml index bbebabf44..534eb65ac 100644 --- a/.github/workflows/archive.yml +++ b/.github/workflows/archive.yml @@ -27,5 +27,5 @@ jobs: 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,Status: On Hold,Status: Blocked' - exempt-pr-label: 'Status: In Progress,Status: On Hold,Status: Blocked' + exempt-issue-labels: 'Status: In Progress,Status: On Hold,Status: Blocked' + exempt-pr-labels: 'Status: In Progress,Status: On Hold,Status: Blocked' From 532f595711489acdf76ba0fa8f8c32fc6419068c Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Sat, 2 May 2020 15:04:30 +0800 Subject: [PATCH 3/7] Add quotes around exempt labels --- .github/workflows/archive.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml index 534eb65ac..63d15b782 100644 --- a/.github/workflows/archive.yml +++ b/.github/workflows/archive.yml @@ -27,5 +27,5 @@ jobs: 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-labels: 'Status: In Progress,Status: On Hold,Status: Blocked' - exempt-pr-labels: 'Status: In Progress,Status: On Hold,Status: Blocked' + exempt-issue-labels: '"Status: In Progress","Status: On Hold","Status: Blocked"' + exempt-pr-labels: '"Status: In Progress","Status: On Hold","Status: Blocked"' From e84bdeefcd00b50e4d0f05bca135b77209451095 Mon Sep 17 00:00:00 2001 From: Ben Thomson Date: Sun, 3 May 2020 10:12:13 +0800 Subject: [PATCH 4/7] Revert changes to exempt labels for archive check For whatever reason - perhaps because we use spaces in our label names - the multiple exempt labels would not work when archiving issues and PRs. --- .github/workflows/archive.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml index 63d15b782..a42e0ca76 100644 --- a/.github/workflows/archive.yml +++ b/.github/workflows/archive.yml @@ -27,5 +27,5 @@ jobs: 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-labels: '"Status: In Progress","Status: On Hold","Status: Blocked"' - exempt-pr-labels: '"Status: In Progress","Status: On Hold","Status: Blocked"' + exempt-issue-label: 'Status: In Progress' + exempt-pr-label: 'Status: In Progress' From b896924dec1e1e34026377451b2a535bb35ac63d Mon Sep 17 00:00:00 2001 From: Flynsarmy Date: Tue, 5 May 2020 16:07:08 +1000 Subject: [PATCH 5/7] Only prepare the filter widget if there are scopes to prepare (#5064) Fixes #5063. Collaborative effort between @LukeTowers & @Flynsarmy --- modules/backend/behaviors/ListController.php | 55 +++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php index 0a14fff18..d885f1625 100644 --- a/modules/backend/behaviors/ListController.php +++ b/modules/backend/behaviors/ListController.php @@ -232,38 +232,41 @@ class ListController extends ControllerBehavior * Prepare the filter widget (optional) */ if (isset($listConfig->filter)) { - $widget->cssClasses[] = 'list-flush'; - $filterConfig = $this->makeConfig($listConfig->filter); - $filterConfig->alias = $widget->alias . 'Filter'; - $filterWidget = $this->makeWidget(\Backend\Widgets\Filter::class, $filterConfig); - $filterWidget->bindToController(); + + if (!empty($filterConfig->scopes)) { + $widget->cssClasses[] = 'list-flush'; - /* - * Filter the list when the scopes are changed - */ - $filterWidget->bindEvent('filter.update', function () use ($widget, $filterWidget) { - return $widget->onFilter(); - }); + $filterConfig->alias = $widget->alias . 'Filter'; + $filterWidget = $this->makeWidget(\Backend\Widgets\Filter::class, $filterConfig); + $filterWidget->bindToController(); - /* - * Filter Widget with extensibility - */ - $filterWidget->bindEvent('filter.extendScopes', function () use ($filterWidget) { - $this->controller->listFilterExtendScopes($filterWidget); - }); + /* + * Filter the list when the scopes are changed + */ + $filterWidget->bindEvent('filter.update', function () use ($widget, $filterWidget) { + return $widget->onFilter(); + }); - /* - * Extend the query of the list of options - */ - $filterWidget->bindEvent('filter.extendQuery', function ($query, $scope) { - $this->controller->listFilterExtendQuery($query, $scope); - }); + /* + * Filter Widget with extensibility + */ + $filterWidget->bindEvent('filter.extendScopes', function () use ($filterWidget) { + $this->controller->listFilterExtendScopes($filterWidget); + }); - // Apply predefined filter values - $widget->addFilter([$filterWidget, 'applyAllScopesToQuery']); + /* + * Extend the query of the list of options + */ + $filterWidget->bindEvent('filter.extendQuery', function ($query, $scope) { + $this->controller->listFilterExtendQuery($query, $scope); + }); - $this->filterWidgets[$definition] = $filterWidget; + // Apply predefined filter values + $widget->addFilter([$filterWidget, 'applyAllScopesToQuery']); + + $this->filterWidgets[$definition] = $filterWidget; + } } return $widget; From 15e4e5390145b0478677289aef9620648452e426 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Tue, 5 May 2020 13:12:45 -0400 Subject: [PATCH 6/7] fix typos in halcyon (#5066) --- modules/cms/classes/Meta.php | 2 +- modules/cms/classes/Theme.php | 4 ++-- modules/system/console/ThemeSync.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/cms/classes/Meta.php b/modules/cms/classes/Meta.php index e2fec147d..b74872e1e 100644 --- a/modules/cms/classes/Meta.php +++ b/modules/cms/classes/Meta.php @@ -3,7 +3,7 @@ use Yaml; /** - * The CMS meta file class, used for interacting with YAML files within the Halycon datasources + * The CMS meta file class, used for interacting with YAML files within the Halcyon datasources * * @package october\cms * @author Luke Towers diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php index 50d62ae02..a5306c897 100644 --- a/modules/cms/classes/Theme.php +++ b/modules/cms/classes/Theme.php @@ -59,7 +59,7 @@ class Theme { $theme = new static; $theme->setDirName($dirName); - $theme->registerHalyconDatasource(); + $theme->registerHalcyonDatasource(); return $theme; } @@ -546,7 +546,7 @@ class Theme * Ensures this theme is registered as a Halcyon datasource. * @return void */ - public function registerHalyconDatasource() + public function registerHalcyonDatasource() { $resolver = App::make('halcyon'); diff --git a/modules/system/console/ThemeSync.php b/modules/system/console/ThemeSync.php index 9bdeacfe2..f709921d0 100644 --- a/modules/system/console/ThemeSync.php +++ b/modules/system/console/ThemeSync.php @@ -207,7 +207,7 @@ class ThemeSync extends Command * @param string $path * @param string $model * @param \Cms\Classes\Theme $theme - * @return \October\Rain\Halycon\Model + * @return \October\Rain\Halcyon\Model */ protected function getModelForPath($path, $modelClass, $theme) { From a5ccfb2f993b7ea0106775ceb23ff5a202de52a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mantas=20=C5=A0imk=C5=ABnas?= Date: Tue, 12 May 2020 20:30:03 +0300 Subject: [PATCH 7/7] Documented indeterminate checkboxes (#5068) --- modules/system/assets/ui/docs/checkbox.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/system/assets/ui/docs/checkbox.md b/modules/system/assets/ui/docs/checkbox.md index d4276d9cd..7167d823b 100644 --- a/modules/system/assets/ui/docs/checkbox.md +++ b/modules/system/assets/ui/docs/checkbox.md @@ -47,6 +47,15 @@ Allows a user to select from a list of binary options. +### Indeterminate checkboxes + +
+ + +
+ +The `data-checked` attribute may have one of three values: 0 (off), 1 (indeterminate) or 2 (on). + ### Radio