Sync upstream (3.4)

.env.example

@@ -9,6 +9,7 @@ ACTIVE_THEME=demo
 BACKEND_URI=/admin
 CMS_ROUTE_CACHE=false
 CMS_ASSET_CACHE=false
+CMS_SAFE_MODE=false
 LINK_POLICY=detect
 DEFAULT_FILE_MASK=775
 DEFAULT_FOLDER_MASK=775

composer.json

@@ -6,7 +6,7 @@
     "license": "proprietary",
     "require": {
         "php": "^8.0.2",
-        "october/rain": "^3.3",
+        "october/rain": "^3.4",
         "laravel/framework": "^9.0"
     },
     "require-dev": {
@@ -44,6 +44,6 @@
             "System\\Console\\": "modules/system/console"
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true
 }

config/backend.php

@@ -142,7 +142,7 @@
     | require_lowercase - Require at least one lowercase letter (a–z)
     | require_number    - Require at least one number
     | require_nonalpha  - Require at least one non-alphanumeric character
-    | expire_days       - Enable password expiration after number of days (@todo)
+    | expire_days       - Enable password expiration after number of days
     |
     */
 
@@ -152,6 +152,7 @@
         'require_lowercase' => false,
         'require_number' => false,
         'require_nonalpha' => false,
+        'expire_days' => false,
     ],
 
     /*
@@ -194,4 +195,16 @@
 
     'timezone' => 'UTC',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Middleware Group
+    |--------------------------------------------------------------------------
+    |
+    | The name of the middleware group to apply to all backend application routes.
+    | You may use this to apply your own middleware definition.
+    |
+    */
+
+    'middleware_group' => 'web',
+
 ];

config/cms.php

@@ -188,6 +188,19 @@
 
     'safe_mode' => env('CMS_SAFE_MODE', null),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Middleware Group
+    |--------------------------------------------------------------------------
+    |
+    | The name of the middleware group to apply to all CMS application routes.
+    | You may use this to apply your own middleware definition, or use some
+    | of the defaults: web, api
+    |
+    */
+
+    'middleware_group' => 'web',
+
     /*
     |--------------------------------------------------------------------------
     | V1 Security Policy

modules/backend/lang/en.json

@@ -121,7 +121,7 @@
   "Please enter a new password.": "Please enter a new password.",
   "Password": "Password",
   "Password Restore": "Password Restore",
-  "Please enter your login to restore the password.": "Please enter your login to restore the password.",
+  "Please enter your login to restore the password.": "Please enter your username to restore the password.",
   "A user could not be found with a login value of ':login'": "A user could not be found with a login value of ':login'",
   "If your account was found, a message has been sent to your email address with instructions.": "If your account was found, a message has been sent to your email address with instructions.",
   "Invalid password reset data supplied. Please try again!": "Invalid password reset data supplied. Please try again!",
@@ -206,5 +206,9 @@
   "Icons": "Icons",
   "Left Side": "Left Side",
   "Add New Item": "Add New Item",
-  "Link Color": "Link Color"
+  "Link Color": "Link Color",
+  "Current Password": "Current Password",
+  "New Password": "New Password",
+  "Current password does not match. Please try again!": "Current password does not match. Please try again!",
+  "Your password has expired, please create a new one for security reasons.": "Your password has expired, please create a new one for security reasons."
 }

modules/backend/lang/en/lang.php

@@ -46,7 +46,7 @@
     'signed_in_as' => 'Signed in as :full_name',
     'sign_out' => 'Sign Out',
     'login_prompt' => 'Welcome back! Please login to your account to continue.',
-    'login_placeholder' => 'login',
+    'login_placeholder' => 'username',
     'password_placeholder' => 'password',
     'enter_email' => 'Enter your email',
     'email_placeholder' => 'email',

modules/backend/lang/nl.json

@@ -67,7 +67,7 @@
   "Pick a Username": "Kies een gebruikersnaam",
   "Enter New Password": "Voer een nieuw wachtwoord in",
   "Confirm Password": "Bevestig wachtwoord",
-  "Create Account": "Account maken",
+  "Create Account": "Nieuw account",
   "Getting Ready": "Bezig met voorbereiden",
   "Just a few more minutes": "Nog een paar minuten",
   "Migrating Database": "Database migreren",
@@ -121,7 +121,7 @@
   "Please enter a new password.": "Vul een nieuw wachtwoord in",
   "Password": "Wachtwoord",
   "Password Restore": "Herstel wachtwoord",
-  "Please enter your login to restore the password.": "Vul gebruikersnaam in",
+  "Please enter your login to restore the password.": "Vul je gebruikersnaam in om je wachtwoord te herstellen",
   "A user could not be found with a login value of ':login'": "Een gebruiker met de gebruikersnaam ':login' is niet gevonden",
   "If your account was found, a message has been sent to your email address with instructions.": "Een e-mail met instructies om het wachtwoord te herstellen is verzonden naar jouw e-mailadres.",
   "Invalid password reset data supplied. Please try again!": "Ongeldige herstelinformatie aangeboden. Probeer het opnieuw!",
@@ -144,9 +144,27 @@
   "full width": "Volledige breedte",
   "Create Widgets": "Creëer Widgets",
   "not equal to": "Niet gelijk aan",
+  "Light Mode": "Lichte modus",
+  "Dark Mode": "Donkere modus",
+  "OS Default": "OS Standaard",
+  "Create a Custom Palette": "Maak eigen kleurenpalet",
+  "Custom Palette": "Eigen kleurenpalet",
   "Primary Color": "Primaire kleur",
   "Secondary Color": "Secundaire kleur",
   "Selection Color": "Selectiekleur",
+  "Nav Text": "Navigatie tekstkleur",
+  "Nav Background": "Navigatie achtergrondkleur",
+  "Sidebar Text": "Zijbalk tekstkleur",
+  "Sidebar Background": "Zijbalk achtergrondkleur",
+  "Sidebar Active Text": "Zijbalk actieve tekstkleur",
+  "Sidebar Active Background": "Zijbalk actieve achtergrondkleur",
+  "Sidebar Hover Background": "Zijbalk zwevend achtergrondkleur",
+  "Settings Text": "Instellingen tekstkleur",
+  "Settings Background": "Instellingen achtergrondkleur",
+  "Settings Item Background": "Instellingen item achtergrondkleur",
+  "Settings Active Color": "Instellingen actieve kleur",
+  "Settings Active Background": "Instellingen actieve achtergrondkleur",
+  "Settings Hover Background": "Instellingen zwevend achtergrondkleur",
   "This name is shown in the title area of the back-end.": "Deze naam wordt weergegeven bij de titel van de beheeromgeving.",
   "App Name": "Applicatie naam",
   "This name is shown on the sign in screen for the back-end.": "Deze slogan wordt weergegeven op het aanmeldscherm van de beheeromgeving.",
@@ -156,7 +174,11 @@
   "Logo": "Logo",
   "Upload a custom favicon to use in the back-end": "Upload een favicon om te gebruiken in de beheeromgeving",
   "Favicon": "Favicon",
-  "This message is shown on the sign in screen for the back-end.": "Dit bericht wordt getoond op het aanmeldscherm van de beheeromgeving.",
+  "Navigation Logo": "Navigatie logo",
+  "Replaces the dashboard link with a custom logo in the navigation.": "Vervangt de dashboard link met een eigen logo in de navigatie.",
+  "Dashboard Icon": "Dashboard icoon",
+  "Use a custom image for the dashboard icon (60x60).": "Gebruik een eigen afbeelding voor het dashboard icoon (60x60).",
+  "This message is shown on the sign in screen for the back-end.": "Dit bericht wordt getoond op het inlogscherm.",
   "Welcome Message": "Welkomstbericht",
   "Login Page": "Inlogpagina",
   "Background Type": "Achtergrondtype",
@@ -171,6 +193,8 @@
   "Custom Image": "Selecteer eigen afbeelding",
   "Login Page Image": "Abeelding op aanmeldscherm",
   "Colors": "Kleuren",
+  "Color Mode": "Kleurmodus",
+  "Color Preset": "Kleuren preset",
   "Menu Style": "Menustijl",
   "Navigation": "Navigatie",
   "Custom Stylesheet": "Aangepaste stylesheet",
@@ -181,5 +205,10 @@
   "Collapsed": "Ingeklapt",
   "Icons": "Iconen",
   "Left Side": "Links gepositioneerd",
-  "Add New Item": "Nieuw item toevoegen"
-}
+  "Add New Item": "Nieuw item toevoegen",
+  "Link Color": "Link kleur",
+  "Current Password": "Huidig wachtwoord",
+  "New Password": "Nieuw wachtwoord",
+  "Current password does not match. Please try again!": "Huidige wachtwoord komt niet overeen. Probeer het opnieuw.",
+  "Your password has expired, please create a new one for security reasons.": "Je wachtwoord is verlopen. Maak een nieuw wachtwoord aan."
+}

modules/backend/lang/nl/lang.php

@@ -510,6 +510,7 @@
       'iso_8859_13' => 'ISO-8859-13 (Latin-7, Baltic Rim)',
       'iso_8859_14' => 'ISO-8859-14 (Latin-8, Celtic)',
       'iso_8859_15' => 'ISO-8859-15 (Latin-9, Western European revision with euro sign)',
+      'windows_1250' => 'Windows-1250 (CP1250)',
       'windows_1251' => 'Windows-1251 (CP1251)',
       'windows_1252' => 'Windows-1252 (CP1252)',
     ],

modules/cms/lang/cs.json

@@ -89,5 +89,22 @@
   "Alias": "Alias",
   "Component aliases are required and can contain only Latin symbols, digits, and underscores. The aliases should start with a Latin symbol.": "Alias komponenty je povinný a může obsahovat pouze písmena, čísla a podtržítka. Alias by měl začínat písmenem.",
   "Unnamed": "Bez jména",
-  "No description provided": "Popis nevyplněn"
+  "No description provided": "Popis nevyplněn",
+  "No snippets found": "Snippety nenalezeny",
+  "Search...": "Hledat...",
+  "Snippet with the requested code :code was not found in the theme.": "Snippet s kódem :code nebyl nalezen v rámci tématu.",
+  "Snippet": "Snippet",
+  "Enter a code to make this partial available as a snippet in content editors.": "Zadejte kód, aby tato dílčí šablona byla dostupná jako snippet v pluginu statických stránek.",
+  "Snippet Code": "Kód snippetu",
+  "The name is displayed in the snippet list in the editor when a snippet is added.": "Tento název bude zobrazen v seznamu snippetů v bočním menu pluginu statických stránek a přímo na stránce, když bude snippet přidán.",
+  "Property Title": "Název vlastnosti",
+  "Code": "Kód",
+  "Property code should start with a Latin letter and can contain only Latin letters and digits": "Kód vlastnosti by měl začínat písmenem a může obsahovat pouze písmena nebo číslice.",
+  "Type": "Vlastnosti",
+  "String": "Řetězec",
+  "Checkbox": "Zaškrtávací políčko",
+  "Dropdown": "Seznam",
+  "Default": "Výchozí",
+  "Options": "Možnosti",
+  "Invalid drop-down option key: :key. Option keys can contain only digits, Latin letters and characters _ and -": "Neplatný klíč položky seznamu: %s. Klíč položky seznamu může obsahovat pouze písmena, číslice a znaky: _-"
 }

modules/cms/lang/de.json

@@ -89,5 +89,22 @@
   "Alias": "Verknüpfung",
   "Component aliases are required and can contain only Latin symbols, digits, and underscores. The aliases should start with a Latin symbol.": "Komponentenverknüpfungen werden benötigt und dürfen nur lateinische Zeichen, Ziffern und Unterstriche beinhalten. Die Verknüpfungen müssen mit einem lateinischen Zeichen beginnen.",
   "Unnamed": "Unbenannt",
-  "No description provided": "Keine Beschreibung angegeben"
+  "No description provided": "Keine Beschreibung angegeben",
+  "No snippets found": "Keine Snippets gefunden",
+  "Search...": "Suche...",
+  "Snippet with the requested code :code was not found in the theme.": "Das Snippet mit dem angeforderten code :code wurde nicht im Theme gefunden.",
+  "Snippet": "Snippet",
+  "Enter a code to make this partial available as a snippet in content editors.": "Geben Sie einen Code ein, um dieses Partial als ein Snippet für das Statische-Seiten Plugin freizugeben.",
+  "Snippet Code": "Snippet code",
+  "The name is displayed in the snippet list in the editor when a snippet is added.": "Der Name wird in der Snippet-Liste in der Seitenleiste der Statische-Seiten angezeigt. Außerdem auf einer Seite wenn ein Snippet angelegt wird.",
+  "Property Title": "Titel für die Eigenschaft",
+  "Code": "Code",
+  "Property code should start with a Latin letter and can contain only Latin letters and digits": "Der Code für die Eigenschaft muss mit einem Buchstaben anfangen, und darf nur Buchstaben und Zahlen enthalten",
+  "Type": "Typ",
+  "String": "Zeichenkette",
+  "Checkbox": "Checkbox",
+  "Dropdown": "Dropdown",
+  "Default": "Standard",
+  "Options": "Optionen",
+  "Invalid drop-down option key: :key. Option keys can contain only digits, Latin letters and characters _ and -": "Ungültiger Dropdown Optionsschlüssel: %s. Optionsschlüssel dürfen nur Zahlen, Buchstaben und die Zeichen _ und - enthalten"
 }

modules/cms/lang/el.json

@@ -87,5 +87,22 @@
   "Alias": "Ψευδώνυμο",
   "Component aliases are required and can contain only Latin symbols, digits, and underscores. The aliases should start with a Latin symbol.": "Τα ψευδώνυμα των συστατικών είναι υποχρεωτικά και μπορούν να περιέχουν μόνο Λατινικά σύμβολα, αριθμούς, και κάτω παύλες. Τα ψευδώνυμα θα πρέπει να αρχίζουν με ένα λατινικό σύμβολο.",
   "Unnamed": "Χωρίς Όνομα",
-  "No description provided": "Δεν παρέχεται περιγραφή"
+  "No description provided": "Δεν παρέχεται περιγραφή",
+  "No snippets found": "Δεν βρέθηκαν αποσπάσματα",
+  "Search...": "Αναζήτηση...",
+  "Snippet with the requested code :code was not found in the theme.": "Απόσπασμα με τον ζητούμενο κωδικό :code δεν βρέθηκε στο πρότυπο θέμα.",
+  "Snippet": "Αποσπάσματα",
+  "Enter a code to make this partial available as a snippet in content editors.": "Εισάγετε ένα κώδικα για να κάνεται αυτό το partial διαθέσιμο σαν απόσπασμα στο πρόσθετο Στατικών Σελίδων.",
+  "Snippet Code": "Κώδικας αποσπάσματος",
+  "The name is displayed in the snippet list in the editor when a snippet is added.": "Το όνομα εμφανίζεται στην λίστα αποσπασμάτων στην πλευρική στήλη Στατικών Σελίδων και σε μία Σελίδα όταν προστίθεται ένα απόσπασμα.",
+  "Property Title": "Τίτλος ιδιότητας",
+  "Code": "Κωδικός",
+  "Property code should start with a Latin letter and can contain only Latin letters and digits": "Οι κωδικοί των ιδιοτήτων πρέπει να ξεκινούν με Λατινικά γράμματα και μπορούν να περιέχουν μόνο Λατινικά γράμματα και αριθμητικά ψηφία",
+  "Type": "Τύπος",
+  "String": "Κείμενο",
+  "Checkbox": "Πλαίσιο ελέγχου",
+  "Dropdown": "Πτυσσόμενες επιλογές",
+  "Default": "Προκαθορισμένο",
+  "Options": "Επιλογές",
+  "Invalid drop-down option key: :key. Option keys can contain only digits, Latin letters and characters _ and -": "Μή έγκυρο κλειδί πτυσσόμενης επιλογής: :key. Τα κλειδιά επιλογών μπορούνα να περιέχουν μόνο αριθμιτικά ψηφία, Λατινικά γράμματα και τους χαρακτήρες _ και -"
 }

modules/cms/lang/en.json

@@ -111,5 +111,31 @@
   "Alias": "Alias",
   "Component aliases are required and can contain only Latin symbols, digits, and underscores. The aliases should start with a Latin symbol.": "Component aliases are required and can contain only Latin symbols, digits, and underscores. The aliases should start with a Latin symbol.",
   "Unnamed": "Unnamed",
-  "No description provided": "No description provided"
-}
+  "No description provided": "No description provided",
+  "No snippets found": "No snippets found",
+  "Search...": "Search...",
+  "Snippet with the requested code :code was not found in the theme.": "Snippet with the requested code :code was not found in the theme.",
+  "Snippet": "Snippet",
+  "Enter a code to make this partial available as a snippet in content editors.": "Enter a code to make this partial available as a snippet in content editors.",
+  "Please enter the snippet code": "Please enter the snippet code",
+  "Snippet Code": "Snippet Code",
+  "The name is displayed in the snippet list in the editor when a snippet is added.": "The name is displayed in the snippet list in the editor when a snippet is added.",
+  "Please enter the snippet name": "Please enter the snippet name",
+  "Property Title": "Property Title",
+  "Snippet Properties": "Snippet Properties",
+  "Please provide the property title": "Please provide the property title",
+  "Code": "Code",
+  "Please provide the property name": "Please provide the property name",
+  "Property code should start with a Latin letter and can contain only Latin letters and digits": "Property code should start with a Latin letter and can contain only Latin letters and digits",
+  "Type": "Type",
+  "Select": "Select",
+  "String": "String",
+  "Checkbox": "Checkbox",
+  "Dropdown": "Dropdown",
+  "Please select the property type": "Please select the property type",
+  "Default": "Default",
+  "Options": "Options",
+  "Define Snippet": "Define Snippet",
+  "Invalid drop-down option key: :key. Option keys can contain only digits, Latin letters and characters _ and -": "Invalid drop-down option key: :key. Option keys can contain only digits, Latin letters and characters _ and -",
+  "The description is displayed in the snippet list in the editor when a snippet is added.": "The description is displayed in the snippet list in the editor when a snippet is added."
+}

modules/cms/lang/en/lang.php

@@ -281,12 +281,14 @@
     'learn_more' => 'Learn more',
     'docs' => [
       'partial' => 'Renders the contents of a CMS partial.',
+      'ajaxpartial' => 'Renders the contents of a CMS partial with AJAX support.',
       'page' => 'Renders the contents of a CMS page into a layout template.',
       'content' => 'Renders a CMS content block.',
       'component' => 'Renders the default markup content for a CMS component.',
       'placeholder' => 'Renders a placeholder section.',
       'scripts' => 'Inserts JavaScript file references to scripts injected by the application.',
       'styles' => 'Renders CSS links to stylesheet files injected by the application.',
+      'meta' => 'Renders HTML meta tags injected by the application.',
       'flash' => 'Renders any flash messages stored in the user session.',
       'verbatim' => 'Marks entire sections as being raw text that should not be parsed.',
       'macro' => 'Allows to define custom functions in a template.',
@@ -335,9 +337,10 @@
       'page_filter' => 'The `page` filter creates a link to a page using a page file name, without an extension, as a parameter.',
       'theme_filter' => 'The `theme` filter returns an address relative to the active theme path of the website. ',
       'app_filter' => 'The `app` filter returns an address relative to the public path of the website.',
-      'media_filter' => 'The `media` filter returns an address relative to the public path of the [media manager library](https://octobercms.com/docs/cms/mediamanager). ',
+      'media_filter' => 'The `media` filter returns an address relative to the public path of the [media manager library](https://docs.octobercms.com/3.x/cms/media/introduction.html).',
       'md_filter' => 'The `md` filter converts the value from Markdown to HTML format.',
       'raw_filter' => 'The `raw` filter marks the value as being "safe", which means that a variable will not be escaped if `raw` is the last filter applied to it.',
+      'content_filter' => 'The `content` filter converts links and snippets found within the string as content.',
     ],
   ],
 ];