Merge branch 'develop' into add-duplication-to-mediamanager

.editorconfig

@@ -11,5 +11,5 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[.github/workflows/**.{yml,yaml}]
+[**/.github/workflows/**.{yml,yaml}]
 indent_size = 2

.gitattributes

@@ -8,3 +8,4 @@
 .gitattributes export-ignore
 .gitpod.yml export-ignore
 CHANGELOG.md export-ignore
+/package.json export-ignore

README.md

@@ -9,8 +9,7 @@ No matter how large or small your project is, Winter provides a rich development
 [![Version](https://img.shields.io/github/v/release/wintercms/winter?sort=semver&style=flat-square)](https://github.com/wintercms/winter/releases)
 [![Tests](https://img.shields.io/github/actions/workflow/status/wintercms/winter/tests.yml?branch=develop&label=tests&style=flat-square)](https://github.com/wintercms/winter/actions)
 [![License](https://img.shields.io/github/license/wintercms/winter?label=open%20source&style=flat-square)](https://packagist.org/packages/wintercms/winter)
-[![Discord](https://img.shields.io/discord/816852513684193281?label=discord&style=flat-square)](https://discord.gg/D5MFSPH6Ux)
-[![RINGER](https://www.ringerhq.com/images/get-support-on-ringer.svg)](https://www.ringerhq.com/i/wintercms/winter)
+[![Discord](https://img.shields.io/badge/discord-join-purple?style=flat-square&logo=discord&logoColor=white)](https://discord.gg/D5MFSPH6Ux)
 
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/wintercms/winter)
 

composer.json

@@ -24,7 +24,7 @@
     ],
     "support": {
         "issues": "https://github.com/wintercms/winter/issues",
-        "docs": "https://wintercms.github.io/docs/",
+        "docs": "https://wintercms.com/docs/",
         "discord": "https://discord.gg/D5MFSPH6Ux",
         "source": "https://github.com/wintercms/winter"
     },
@@ -46,9 +46,6 @@
         "dms/phpunit-arraysubset-asserts": "^0.1.0|^0.2.1"
     },
     "scripts": {
-        "post-root-package-install": [
-            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-        ],
         "post-create-project-cmd": [
             "@php artisan key:generate"
         ],

config/app.php

@@ -14,6 +14,10 @@
     | You can create a CMS page with route "/error" to set the contents
     | of this page. Otherwise a default error page is shown.
     |
+    | IMPORTANT: Always have debug mode set to false in production environments
+    | as it can reveal sensitive information about your application and
+    | infrastructure to untrusted users through more detailed errors.
+    |
     */
 
     'debug' => env('APP_DEBUG', true),

config/cors.php

@@ -0,0 +1,34 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cross-Origin Resource Sharing (CORS) Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure your settings for cross-origin resource sharing
+    | or "CORS". This determines what cross-origin operations may execute
+    | in web browsers. You are free to adjust these settings as needed.
+    |
+    | To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+    |
+    */
+
+    'paths' => [],
+
+    'allowed_methods' => ['*'],
+
+    'allowed_origins' => ['*'],
+
+    'allowed_origins_patterns' => [],
+
+    'allowed_headers' => ['*'],
+
+    'exposed_headers' => [],
+
+    'max_age' => 0,
+
+    'supports_credentials' => false,
+
+];

config/mail.php

@@ -35,7 +35,6 @@
 
     'mailers' => [
         'smtp' => [
-            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
             'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
             'password' => env('MAIL_PASSWORD'),
             'port' => env('MAIL_PORT', 587),

modules/backend/ServiceProvider.php

@@ -55,7 +55,7 @@ protected function registerConsole()
         $this->registerConsoleCommand('create.controller', \Backend\Console\CreateController::class);
         $this->registerConsoleCommand('create.formwidget', \Backend\Console\CreateFormWidget::class);
         $this->registerConsoleCommand('create.reportwidget', \Backend\Console\CreateReportWidget::class);
-
+        $this->registerConsoleCommand('user.create', \Backend\Console\UserCreate::class);
         $this->registerConsoleCommand('winter.passwd', \Backend\Console\WinterPasswd::class);
     }
 

modules/backend/assets/css/winter.css

@@ -304,7 +304,7 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
 .control-treeview ol>li>div{font-size:14px;font-weight:normal;background:#fff;border-bottom:1px solid #ecf0f1;position:relative}
 .control-treeview ol>li>div>a{color:#2b3e50;padding:11px 45px 10px 61px;display:block;line-height:150%;text-decoration:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
 .control-treeview ol>li>div:before{content:' ';background-image:url(../images/treeview-icons.png);background-position:0 -28px;background-repeat:no-repeat;background-size:42px auto;position:absolute;width:21px;height:22px;left:28px;top:15px}
-.control-treeview ol>li>div span.comment{display:block;font-weight:400;color:#95a5a6;font-size:13px;margin-top:2px;overflow:hidden;text-overflow:ellipsis}
+.control-treeview ol>li>div span.comment{display:block;font-weight:400;color:#95a5a6;font-size:13px;margin-top:2px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .control-treeview ol>li>div>span.expand{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;display:none;position:absolute;width:20px;height:20px;top:19px;left:2px;cursor:pointer;color:#bdc3c7;-webkit-transition:transform 0.1s ease;transition:transform 0.1s ease}
 .control-treeview ol>li>div>span.expand:before{font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f0da";line-height:100%;font-size:15px;position:relative;left:8px;top:2px}
 .control-treeview ol>li>div>span.drag-handle{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;-webkit-transition:opacity 0.4s;transition:opacity 0.4s;position:absolute;right:9px;bottom:0;width:18px;height:19px;cursor:move;color:#bdc3c7;opacity:0;filter:alpha(opacity=0)}
@@ -358,8 +358,10 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
 .control-treeview ol>li.has-subitems>div.popover-highlight:before{background-position:0 -52px}
 .control-treeview ol>li.has-subitems>div span.expand{display:block}
 .control-treeview ol>li.placeholder{position:relative;opacity:0.5;filter:alpha(opacity=50)}
+.control-treeview ol>li.placeholder ol{display:none}
 .control-treeview ol>li.dragged{position:absolute;z-index:2000;opacity:0.25;filter:alpha(opacity=25)}
 .control-treeview ol>li.dragged>div{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
+.control-treeview ol>li.dragged ol{display:none}
 .control-treeview ol>li.drop-target>div{background-color:#2581b8 !important}
 .control-treeview ol>li.drop-target>div>a{color:#fff}
 .control-treeview ol>li.drop-target>div>a>span.comment{color:#fff}
@@ -438,7 +440,7 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
 .control-treeview.treeview-light ol>li>div>ul.submenu li p a{display:table-cell;vertical-align:middle;height:100%;padding:0 20px;font-size:13px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
 .control-treeview.treeview-light ol>li>div>ul.submenu li p a i.control-icon{font-size:22px;margin-right:0}
 body.dragging .control-treeview ol.dragging,
-body.dragging .control-treeview ol.dragging ol{background:#ccc;padding-right:20px;-webkit-transition:padding 1s;transition:padding 1s}
+body.dragging .control-treeview ol.dragging ol{background:#ccc;padding-right:0}
 body.dragging .control-treeview ol.dragging>li>div,
 body.dragging .control-treeview ol.dragging ol>li>div{margin-right:0;-webkit-transition:margin 1s;transition:margin 1s}
 body.dragging .control-treeview ol.dragging>li>div .custom-checkbox,
@@ -1101,4 +1103,4 @@ html.cssanimations .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.f
 .flyout-toggle i{margin:7px 0 0 6px;display:inline-block}
 .flyout-toggle:hover i{color:#fff}
 body.flyout-visible{overflow:hidden}
-body.flyout-visible .flyout-overlay{background-color:rgba(0,0,0,0.3)}
+body.flyout-visible .flyout-overlay{background-color:rgba(0,0,0,0.3)}

modules/backend/assets/less/controls/treeview.less

@@ -57,6 +57,7 @@
                     margin-top: 2px;
                     overflow: hidden;
                     text-overflow: ellipsis;
+                    white-space: nowrap;
                 }
 
                 > span.expand {
@@ -297,6 +298,10 @@
             &.placeholder {
                 position: relative;
                 .opacity(.5);
+
+                ol {
+                    display: none;
+                }
             }
 
             &.dragged {
@@ -307,6 +312,10 @@
                 > div {
                     .border-radius(3px);
                 }
+
+                ol {
+                    display: none;
+                }
             }
 
             &.drop-target {
@@ -548,8 +557,7 @@
 body.dragging .control-treeview {
     ol.dragging, ol.dragging ol {
         background: #ccc;
-        padding-right: 20px;
-        .transition(padding 1s);
+        padding-right: 0;
 
         > li {
             > div {