Merge pull request #5660 from octobercms/develop

Version 3.1 Release

.gitignore

@@ -22,6 +22,7 @@ package-lock.json
 _ide_helper.php
 .phpunit.result.cache
 nbproject
+.phpstorm.meta.php
 
 # Project
 /bootstrap/compiled.php

README.md

@@ -31,6 +31,8 @@ The best place to learn October CMS is by [reading the documentation](https://oc
 
 You may also watch this [introductory video](https://www.youtube.com/watch?v=yLZTOeOS7wI). Make sure to check out our [official YouTube channel](https://www.youtube.com/c/OctoberCMSOfficial). There is also the excellent video series by [Watch & Learn](https://watch-learn.com/series/making-websites-with-october-cms).
 
+For code examples of building with October CMS, visit the [RainLab Plugin Suite](https://github.com/rainlab) or the [October Demos Repo](https://github.com/octoberdemos).
+
 ## Coding Standards
 
 Please follow the following guides and code standards:

composer.json

@@ -6,7 +6,7 @@
     "license": "proprietary",
     "require": {
         "php": "^8.0.2",
-        "october/rain": "^3.0",
+        "october/rain": "dev-develop",
         "laravel/framework": "^9.0"
     },
     "require-dev": {

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

config/filesystems.php

@@ -33,8 +33,29 @@
         'local' => [
             'driver' => 'local',
             'root' => storage_path('app'),
-            'url' => '/storage/app',
+            'throw' => false,
+        ],
+
+        'uploads' => [
+            'driver' => 'local',
+            'root' => storage_path('app/uploads'),
+            'url' => '/storage/app/uploads',
+            'throw' => false,
+        ],
+
+        'media' => [
+            'driver' => 'local',
+            'root' => storage_path('app/media'),
+            'url' => '/storage/app/media',
             'visibility' => 'public',
+            'throw' => false,
+        ],
+
+        'resources' => [
+            'driver' => 'local',
+            'root' => storage_path('app/resources'),
+            'url' => '/storage/app/resources',
+            'throw' => false,
         ],
 
         's3' => [
@@ -45,6 +66,8 @@
             'bucket' => env('AWS_BUCKET'),
             'url' => env('AWS_URL'),
             'endpoint' => env('AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+            'throw' => false,
         ],
 
     ],

config/system.php

@@ -91,54 +91,8 @@
     */
 
     'default_mask' => [
-
         'file' => env('DEFAULT_FILE_MASK'),
-
         'folder' => env('DEFAULT_FOLDER_MASK'),
-
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Resource storage
-    |--------------------------------------------------------------------------
-    |
-    | Specifies the configuration for resource storage, such as media and
-    | upload files. These resources are used:
-    |
-    | media     - generated by the media manager.
-    | uploads   - generated by attachment model relationships.
-    | resources - generated by combiner and resizer services.
-    |
-    | For each resource you can specify:
-    |
-    | disk   - filesystem disk, as specified in filesystems.php config.
-    | folder - a folder prefix for storing all generated files inside.
-    | path   - the public path relative to the application base URL,
-    |          or you can specify a full URL path.
-    |
-    */
-
-    'storage' => [
-
-        'uploads' => [
-            'disk'   => 'local',
-            'folder' => 'uploads',
-            'path'   => '/storage/app/uploads',
-        ],
-
-        'media' => [
-            'disk'   => 'local',
-            'folder' => 'media',
-            'path'   => '/storage/app/media',
-        ],
-
-        'resources' => [
-            'disk'   => 'local',
-            'folder' => 'resources',
-            'path'   => '/storage/app/resources',
-        ],
-
     ],
 
     /*

modules/backend/lang/ar.json

@@ -91,5 +91,21 @@
   "Settings": "إعدادات",
   "Background Color": "لون الخلفية",
   "Allow users to create new roles and edit or delete roles lower than their highest role.": "اسمح للمستخدمين بإنشاء أدوار جديدة وتعديل الأدوار الأقل من أعلى مستوى لهم أو حذفها.",
-  "Save Changes": "حفظ التغييرات"
+  "Save Changes": "حفظ التغييرات",
+  "This log displays a list of successful sign in attempts by administrators. Records are kept for a total of :days days.": "يعرض هذا السجل قائمة بمحاولات تسجيل الدخول الناجحة بواسطة المسؤولين. يتم الاحتفاظ بالسجلات لما مجموعه: أيام أيام.",
+  "Access Log": "سجل الوصول",
+  "View a list of successful back-end user sign ins.": "اعرض قائمة بعمليات تسجيل دخول المستخدم الخلفية الناجحة.",
+  "ID": "بطاقة تعريف",
+  "Date & Time": "التاريخ والوقت",
+  "Type": "يكتب",
+  "IP address": "عنوان IP",
+  "Login": "تسجيل الدخول",
+  "First name": "الاسم الاول",
+  "Last name": "اللقب",
+  "Email": "البريد الإلكتروني",
+  "Translated for locale: :value": "مترجمة للغة:: القيمة",
+  "Translated for site: :value": "مترجم للموقع:: القيمة",
+  "A custom schema is used for this file format.": "يتم استخدام مخطط مخصص لتنسيق الملف هذا.",
+  "Select": "يختار",
+  "Replace": "يحل محل"
 }