diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml
index be7fc6710..a42e0ca76 100644
--- a/.github/workflows/archive.yml
+++ b/.github/workflows/archive.yml
@@ -8,19 +8,19 @@ 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.
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;
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 bc54a9731..6ce06a1c5 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;
}
@@ -547,7 +547,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/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