Merge branch 'develop' into wip-laravel-11

Author: LukeTowers

.github/ISSUE_TEMPLATE/1_BUG_REPORT.yaml

@@ -27,6 +27,9 @@ body:
       label: PHP Version
       description: Please provide us the branch of PHP version. For example, for PHP version 7.4.9, select `7.4`, or for PHP version 8.0.1, select `8.0`.
       options:
+        - 8.4
+        - 8.3
+        - 8.2
         - 8.1
         - 8.0
         - 7.4

.github/workflows/code-quality.yaml

@@ -27,7 +27,7 @@ jobs:
       - name: Install PHP and PHP Code Sniffer
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.2
           extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip
           tools: phpcs
 

.github/workflows/tests.yml

@@ -96,7 +96,7 @@ jobs:
       max-parallel: 8
       matrix:
         operatingSystem: [ubuntu-latest, windows-latest]
-        phpVersion: ['8.2', '8.3']
+        phpVersion: ['8.2', '8.3', '8.4']
       fail-fast: false
     runs-on: ${{ matrix.operatingSystem }}
     name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }}
@@ -121,7 +121,7 @@ jobs:
           key: ${{ env.key }}
 
       - name: Cache extensions
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.extcache.outputs.dir }}
           key: ${{ steps.extcache.outputs.key }}
@@ -154,7 +154,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

config/app.php

@@ -63,7 +63,7 @@
     */
 
     'asset_url' => env('ASSET_URL', null),
-    
+
     /*
     |--------------------------------------------------------------------------
     | Temporary Path
@@ -195,6 +195,19 @@
 
     'timezone' => 'UTC',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Scheduler Timezone
+    |--------------------------------------------------------------------------
+    |
+    | This property specifies the default timezone for your application's
+    | scheduled tasks. You can set it independently of the application's
+    | default timezone to ensure that schedules run at the desired local time.
+    |
+    */
+
+    'schedule_timezone' => 'UTC',
+
     /*
     |--------------------------------------------------------------------------
     | Application Locale Configuration

modules/backend/ServiceProvider.php

@@ -1,13 +1,19 @@
 <?php namespace Backend;
 
-use Backend;
-use BackendMenu;
-use BackendAuth;
-use Backend\Models\UserRole;
 use Backend\Classes\WidgetManager;
-use System\Classes\MailManager;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Backend\Facades\BackendMenu;
+use Backend\Models\AccessLog;
+use Backend\Models\UserRole;
+use Exception;
+use Illuminate\Support\Facades\Event;
 use System\Classes\CombineAssets;
+use System\Classes\MailManager;
 use System\Classes\SettingsManager;
+use System\Classes\UpdateManager;
+use Winter\Storm\Support\Facades\Config;
+use Winter\Storm\Support\Facades\Flash;
 use Winter\Storm\Support\ModuleServiceProvider;
 
 class ServiceProvider extends ModuleServiceProvider
@@ -25,6 +31,7 @@ public function register()
         $this->registerMailer();
         $this->registerAssetBundles();
         $this->registerBackendPermissions();
+        $this->registerBackendUserEvents();
 
         /*
          * Backend specific
@@ -207,6 +214,28 @@ protected function registerBackendPermissions()
         });
     }
 
+    /**
+     * Register the backend user events
+     */
+    protected function registerBackendUserEvents()
+    {
+        Event::listen('backend.user.login', function (\Backend\Models\User $user) {
+            // @TODO: Deprecate this, and only run migrations when it makes sense
+            $runMigrationsOnLogin = (bool) Config::get('cms.runMigrationsOnLogin', Config::get('app.debug', false));
+            if ($runMigrationsOnLogin) {
+                try {
+                    // Load version updates
+                    UpdateManager::instance()->update();
+                } catch (Exception $e) {
+                    Flash::error($e->getMessage());
+                }
+            }
+
+            // Log the sign in event
+            AccessLog::add($user);
+        });
+    }
+
     /*
      * Register widgets
      */

modules/backend/assets/css/winter.css

@@ -17,7 +17,7 @@
 @color-border:                               #cccccc;
 @color-border-light:                         #e1e1e1;
 
-@color-mainmenu:                             #000000;
+@color-mainmenu:                             #151515;
 @color-mainmenu-inactive:                    rgba(255,255,255,.6);
 @color-mainmenu-active:                      #ffffff;
 @color-mainmenu-active-bg:                   #262626;
@@ -93,10 +93,10 @@
 @color-filelist-hero-active-bg:              @highlight-active-bg;
 @color-filelist-hero-active-text:            @highlight-active-text;
 
-@color-fancy-master-tabs-bg:                 #d35400;
+@color-fancy-master-tabs-bg:                 @brand-secondary-darker;
 @color-fancy-master-tabs-active-text:        #ffffff;
 @color-fancy-master-tabs-inactive-text:      rgba(255, 255, 255, .35);
-@color-fancy-master-panel-bg:                #d35400;
+@color-fancy-master-panel-bg:                @brand-secondary-darker;
 
 @color-fancy-secondary-tabs-bg:              #475354;
 @color-fancy-secondary-tabs-active-text:     #ffffff;
@@ -111,9 +111,9 @@
 @color-fancy-form-tabless-fields-bg:         @brand-secondary;
 @color-fancy-form-label:                     rgba(255, 255, 255, .5);
 @color-fancy-form-text:                      #ffffff;
-@color-fancy-form-text-selection:            #d35400;
+@color-fancy-form-text-selection:            @brand-secondary-darker;
 @color-fancy-form-placeholder:               rgba(255, 255, 255, .5);
-@color-fancy-form-inactive-tab:              #b9530f;
+@color-fancy-form-inactive-tab:              #2c9cb9;
 
 @color-sortable-caret:                       #999999;
 @color-sortable-active:                      @brand-secondary;
@@ -150,4 +150,4 @@
 // --------------------------------------------------
 
 @menu-breakpoint-min:           770px;
-@menu-breakpoint-max:           (@menu-breakpoint-min - 1);
+@menu-breakpoint-max:           (@menu-breakpoint-min - 1);

modules/backend/assets/images/dashboard-icon.svg

@@ -437,10 +437,6 @@ body.fancy-layout .master-tabs.control-tabs,
             }
         }
 
-        .tab-collapse-icon.primary {
-            color: #808c8d;
-        }
-
         &.primary-collapsed {
             .tab-collapse-icon.primary {
                 color: white;

modules/backend/assets/images/media-icon.svg

@@ -41,14 +41,14 @@
     }
 
     .sidepanel-content-header {
-        background: #d35400;
+        background: @brand-secondary-darker;
         color: white;
         font-size: 15px;
         padding: 12px 20px 13px;
         position: relative;
 
         &:after {
-            .triangle(down, 15px, 8px, #d35400);
+            .triangle(down, 15px, 8px, @brand-secondary-darker);
             position: absolute;
             left: 14px;
             bottom: -8px;
@@ -94,4 +94,4 @@ body.display-side-panel {
     #layout-side-panel .fix-button {
         display: none;
     }
-}
+}