Sync upstream (3.1)

.gitignore

@@ -14,13 +14,15 @@ nginx-ssl.error.log
 php-errors.log
 sftp-config.json
 .ftpconfig
+.vscode/
 selenium.php
 composer.lock
 package-lock.json
 /node_modules
 _ide_helper.php
 .phpunit.result.cache
 nbproject
+.phpstorm.meta.php
 
 # Project
 /bootstrap/compiled.php

config/app.php

@@ -150,9 +150,9 @@
     |
     | Before you change this value, consider carefully if that is actually
     | what you want to do. It is highly recommended that this is always set
-    | to UTC (as your server & DB timezone should be as well) and instead you
-    | use backend.timezone to set the default timezone used in the backend
-    | to display dates & times.
+    | to UTC (as your server & DB timezone should be as well) and instead
+    | you can use backend.timezone or cms.timezone to set the default
+    | timezone used to display dates & times.
     |
     */
 

config/cms.php

@@ -56,6 +56,18 @@
 
     'strict_components' => env('CMS_STRICT_COMPONENTS', false),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Frontend Timezone
+    |--------------------------------------------------------------------------
+    |
+    | This acts as the default setting for a frontend user's timezone used when
+    | converting dates from the system setting, typically set to UTC.
+    |
+    */
+
+    'timezone' => 'UTC',
+
     /*
     |--------------------------------------------------------------------------
     | Template Caching

modules/backend/lang/en.json

@@ -102,5 +102,8 @@
     "Login": "Login",
     "First name": "First name",
     "Last name": "Last name",
-    "Email": "Email"
-}
+    "Email": "Email",
+    "Field is translated per locale": "Field is translated per locale",
+    "Field is translated per site": "Field is translated per site",
+    "A custom schema is used for this file format.": "A custom schema is used for this file format."
+}

modules/backend/lang/en/lang.php

@@ -472,7 +472,7 @@
     'paragraph_formats_comment' => 'The options that will appear in the Paragraph Format dropdown.',
   ],
   'tooltips' => [
-    'preview_website' => 'Preview the website',
+    'preview_website' => 'Preview the Website',
   ],
   'mysettings' => [
     'menu_label' => 'My Settings',
@@ -495,19 +495,21 @@
     'app_name_description' => 'This name is shown in the title area of the back-end.',
     'app_tagline' => 'App Tagline',
     'app_tagline_description' => 'This name is shown on the sign in screen for the back-end.',
+    'login_prompt' => 'Welcome Message',
+    'login_prompt_description' => 'This message is shown on the sign in screen for the back-end.',
     'colors' => 'Colors',
     'primary_color' => 'Primary Color',
     'secondary_color' => 'Secondary Color',
     'accent_color' => 'Accent Color',
     'selection_color' => 'Selection Color',
-    'login_background_type' => 'Background type',
-    'background_flat_color' => 'Flat color',
+    'login_background_type' => 'Background Type',
+    'background_flat_color' => 'Flat Color',
     'background_wallpaper' => 'Wallpaper',
     'login_page' => 'Login Page',
     'login_image' => 'Image',
     'login_page_image' => 'Login Page Image',
     'login_image_random_autumn_images' => 'Random Autumn Images',
-    'login_image_custom' => 'Custom image',
+    'login_image_custom' => 'Custom Image',
     'background_color' => 'Background Color',
     'background_wallpaper_image' => 'Background Wallpaper Image',
     'background_wallpaper_image_size' => 'Wallpaper Size',

modules/backend/lang/es/lang.php

@@ -25,6 +25,9 @@
   'account' => [
     'sign_out' => 'Desconectarse',
     'login' => 'Entrar',
+    'input_username' => 'Usuario',
+    'input_password' => 'Clave',
+    'login_prompt' => '¡Bienvenido! Inicie sesión para continuar.',
     'reset' => 'Restablecer',
     'restore' => 'Restaurar',
     'login_placeholder' => 'usuario',
@@ -359,6 +362,8 @@
     'app_name_description' => 'Este nombre se mostrará en el título del back-end.',
     'app_tagline' => 'Eslogan',
     'app_tagline_description' => 'Se mostrará en la página de inicio de sesión del back-end.',
+    'login_prompt' => 'Mensaje de bienvenida',
+    'login_prompt_description' => 'Se mostrará en la página de inicio de sesión del back-end.',
     'colors' => 'Colores',
     'primary_color' => 'Primario color',
     'secondary_color' => 'Secundario color',

modules/backend/lang/sk/lang.php

@@ -117,7 +117,7 @@
     'name' => 'Administrátor',
     'menu_label' => 'Administrátori',
     'menu_description' => 'Správa administrátorov, skupín a oprávnení.',
-    'list_title' => 'Spríva administrátorov',
+    'list_title' => 'Správa administrátorov',
     'new' => 'Nový administrátor',
     'login' => 'Prihlasovacie meno',
     'first_name' => 'Krstné meno',

modules/system/lang/en.json

@@ -24,5 +24,7 @@
     ":name settings updated": ":name settings updated",
     "Return to System Settings": "Return to System Settings",
     "Find a Setting...": "Find a Setting...",
-    "Disable mail branding CSS": "Disable mail branding CSS"
+    "Disable mail branding CSS": "Disable mail branding CSS",
+    "Manage Sites": "Manage Sites",
+    "Manage the websites available for this application.": "Manage the websites available for this application."
 }

themes/demo/partials/site/meta.htm

@@ -19,7 +19,7 @@
 <script src="{{ 'assets/vendor/codeblocks/codeblocks.min.js'|theme }}"></script>
 <script src="{{ 'assets/vendor/slick-carousel/slick.min.js'|theme }}"></script>
 <script src="{{ 'assets/js/app.js'|theme }}"></script>
-{% framework extras %}
+{% framework extras turbo %}
 {% scripts %}
 
 <script type="module">

themes/demo/seeds/blueprints/blog/post.yaml

@@ -24,7 +24,7 @@ groups:
                 type: richeditor
                 span: adaptive
 
-            blog_post_content:
+            _blog_post_content:
                 type: mixin
                 source: Blog\PostContent
 
@@ -37,6 +37,6 @@ groups:
                 type: markdown
                 span: adaptive
 
-            blog_post_content:
+            _blog_post_content:
                 type: mixin
                 source: Blog\PostContent