Merge remote-tracking branch 'origin/develop' into wip/laravel-6

.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.
           

modules/backend/behaviors/ListController.php

@@ -232,9 +232,11 @@ class ListController extends ControllerBehavior
          * Prepare the filter widget (optional)
          */
         if (isset($listConfig->filter)) {
+            $filterConfig = $this->makeConfig($listConfig->filter);
+            
+            if (!empty($filterConfig->scopes)) {
                 $widget->cssClasses[] = 'list-flush';
 
-            $filterConfig = $this->makeConfig($listConfig->filter);
                 $filterConfig->alias = $widget->alias . 'Filter';
                 $filterWidget = $this->makeWidget(\Backend\Widgets\Filter::class, $filterConfig);
                 $filterWidget->bindToController();
@@ -265,6 +267,7 @@ class ListController extends ControllerBehavior
 
                 $this->filterWidgets[$definition] = $filterWidget;
             }
+        }
 
         return $widget;
     }

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

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');
 

modules/system/assets/ui/docs/checkbox.md

@@ -47,6 +47,15 @@ Allows a user to select from a list of binary options.
         </div>
     </div>
 
+### Indeterminate checkboxes
+
+    <div class="checkbox custom-checkbox is-indeterminate">
+        <input name="checkbox" value="1" type="checkbox" id="checkbox1" data-checked="1" />
+        <label for="checkbox1">Checkbox</label>
+    </div>
+
+The `data-checked` attribute may have one of three values: 0 (off), 1 (indeterminate) or 2 (on).
+
 ### Radio
 
     <div class="radio custom-radio">

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)
     {