Skip to content

Commit a2a3e1f

Browse files
committed
Sync upstream (3.3)
1 parent d3a4503 commit a2a3e1f

File tree

170 files changed

+537
-531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+537
-531
lines changed

.htaccess

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@
1919
# RewriteRule (.*) https://%{SERVER_NAME}/$1 [L,R=301]
2020

2121
##
22-
## Uncomment to redirect index.php/path/to/page to /path/to/page
22+
## Uncomment to redirect trailing slashes in URLs.
23+
##
24+
# RewriteCond %{REQUEST_FILENAME} !-d
25+
# RewriteRule ^(.*)/$ /$1 [L,R=301]
26+
27+
##
28+
## Uncomment to redirect /index.php/path to /path
2329
##
2430
# RewriteRule ^index\.php/(.*)$ /$1 [L,R=301]
2531

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "proprietary",
77
"require": {
88
"php": "^8.0.2",
9-
"october/rain": "^3.2",
9+
"october/rain": "^3.3",
1010
"laravel/framework": "^9.0"
1111
},
1212
"require-dev": {
@@ -40,6 +40,7 @@
4040
},
4141
"autoload": {
4242
"psr-4": {
43+
"App\\": "app",
4344
"System\\Console\\": "modules/system/console"
4445
}
4546
},

config/backend.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,14 @@
3131
|--------------------------------------------------------------------------
3232
|
3333
| The default backend customization settings. These values are all optional
34-
| and remember to set the enabled value to true.
34+
| and remember to set the enabled value to true. Supported values:
35+
|
36+
| - menu_mode: inline, text, tile, collapse, icons, left
37+
| - color_mode: light, dark, auto
38+
| - color_palette: default, classic, oxford, console, valentino, punch
39+
| - login_background_type: color, wallpaper
40+
| - login_background_wallpaper_size: auto, cover
41+
| - login_image_type: autumn_images, custom
3542
|
3643
*/
3744

@@ -40,8 +47,12 @@
4047
'app_name' => env('APP_NAME', 'October CMS'),
4148
'tagline' => 'Administration Panel',
4249
'menu_mode' => 'icons',
43-
'favicon_path' => '~/app/assets/images/logo.png',
50+
'color_mode' => 'light',
51+
'color_palette' => 'default',
4452
'logo_path' => '~/app/assets/images/logo.png',
53+
'favicon_path' => '~/app/assets/images/favicon.png',
54+
'menu_logo_path' => '~/app/assets/images/menu_logo.png',
55+
'dashboard_icon_path' => '~/app/assets/images/dashboard_icon.png',
4556
'stylesheet_path' => '~/app/assets/less/styles.less',
4657
'login_background_type' => 'color',
4758
'login_background_color' => '#fef6eb',

config/cms.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,19 @@
202202

203203
'security_policy_v1' => env('CMS_SECURITY_POLICY_V1', false),
204204

205+
/*
206+
|--------------------------------------------------------------------------
207+
| V1 Exception Policy
208+
|--------------------------------------------------------------------------
209+
|
210+
| When debug mode is off, throwing exceptions in AJAX will display a generic
211+
| message, except for specific exception types such as ApplicationException
212+
| and ValidationException (allow-list). Instead, you may use V1, which is
213+
| a more relaxed policy that allows all messages and blocks common exception
214+
| types (block-list) but may still leak information in rare cases.
215+
|
216+
*/
217+
218+
'exception_policy_v1' => env('CMS_EXCEPTION_POLICY_V1', false),
219+
205220
];

config/media.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
| Automatically Rename Filenames
2121
|--------------------------------------------------------------------------
2222
|
23-
| When a media file is uploaded, automatically transform its filename.
23+
| When a media file is uploaded, automatically transform its filename to
24+
| something consistent. The "slug" mode will slug the file name for all
25+
| uploads.
2426
|
2527
| Supported: "null", "slug"
2628
|

modules/backend/lang/ar.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,9 @@
111111
"Please enter your login to restore the password.": "أدخل اسم المستخدم",
112112
"Restore": "استرجاع",
113113
"Reset": "استعادة",
114-
"Forgot password?": "نسيت كلمة المرور؟"
114+
"Forgot password?": "نسيت كلمة المرور؟",
115+
"Manage Widgets": "إدارة التطبيقات",
116+
"please select": "من فضلك اختار",
117+
"Width": "العرض",
118+
"full width": "عرض كامل"
115119
}

modules/backend/lang/ar/lang.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
],
1515
'dashboard' => [
1616
'menu_label' => 'لوحة الإدارة',
17-
'widget_width' => 'العرض',
18-
'full_width' => 'عرض كامل',
19-
'manage_widgets' => 'إدارة التطبيقات',
2017
'status' => [
2118
'widget_title_default' => 'حالة النظام',
2219
'update_available' => '{0} تحديث متاح!|{1} تحديث متاح!|[2,Inf] تحديثات متاحة!',
@@ -93,7 +90,6 @@
9390
'select' => 'تحديد',
9491
'select_all' => 'اختر الكل',
9592
'select_none' => 'لا تختر شيء',
96-
'select_placeholder' => 'من فضلك اختار',
9793
'insert_row' => 'إضافة سجل',
9894
'return_to_list' => 'عودة للقائمة',
9995
],

modules/backend/lang/be.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,15 @@
118118
"Password has been reset. You may now sign in.": "Пароль быў зменены, цяпер Вы можаце ўвайсці",
119119
"Restore": "Аднавіць",
120120
"Reset": "Скасаваць",
121-
"Forgot password?": "Забыліся пароль?"
121+
"Forgot password?": "Забыліся пароль?",
122+
"Manage Widgets": "Кіраванне віджэтамі",
123+
"Add Widget": "Дадаць віджэт",
124+
"Set the current layout as the default?": "Зрабіць дадзены макет заходным?",
125+
"Make Default": "Зрабіць зыходным",
126+
"Reset layout back to default?": "Скасаваць макет да зыходных наладаў",
127+
"Reset Layout": "Скасаваць макет",
128+
"Widget": "Віджэт",
129+
"please select": "Калі ласка, выберыце",
130+
"Width": "Шырыня віджэта",
131+
"full width": "Поўная шырыня"
122132
}

modules/backend/lang/be/lang.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@
3838
],
3939
'dashboard' => [
4040
'menu_label' => 'Панэль кіравання',
41-
'widget_label' => 'Віджэт',
42-
'widget_width' => 'Шырыня віджэта',
43-
'full_width' => 'Поўная шырыня',
44-
'manage_widgets' => 'Кіраванне віджэтамі',
45-
'add_widget' => 'Дадаць віджэт',
4641
'widget_inspector_title' => 'Канфігурацыя віджэта',
4742
'widget_inspector_description' => 'Налада адлюстравання віджэта',
4843
'widget_columns_label' => 'Шырыня :columns',
@@ -53,11 +48,7 @@
5348
'widget_new_row_description' => 'Размясціць віджэт на новым радку',
5449
'widget_title_label' => 'Назва віджэта',
5550
'widget_title_error' => 'Віджэт павінен мець назву',
56-
'reset_layout' => 'Скасаваць макет',
57-
'reset_layout_confirm' => 'Скасаваць макет да зыходных наладаў',
5851
'reset_layout_success' => 'Макет быў скасаваны',
59-
'make_default' => 'Зрабіць зыходным',
60-
'make_default_confirm' => 'Зрабіць дадзены макет заходным?',
6152
'make_default_success' => 'Гэты макет цяпер зыходны',
6253
'status' => [
6354
'widget_title_default' => 'Статус сістэмы',
@@ -222,7 +213,6 @@
222213
'select' => 'Выбраць',
223214
'select_all' => 'абраць усё',
224215
'select_none' => 'выбраць няма',
225-
'select_placeholder' => 'Калі ласка, выберыце',
226216
'insert_row' => 'Уставіць радок',
227217
'insert_row_below' => 'Уставіць радок ніжэй',
228218
'delete_row' => 'Выдаліць радок',

modules/backend/lang/bg.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,10 @@
118118
"Password has been reset. You may now sign in.": "Вашата парола е успешно нулирана. Сега може да се логнете.",
119119
"Restore": "Възстановяване",
120120
"Reset": "Нулиране",
121-
"Forgot password?": "Забравена парола?"
121+
"Forgot password?": "Забравена парола?",
122+
"Add Widget": "Добави джаджа",
123+
"Widget": "Джаджа",
124+
"please select": "моля изберете",
125+
"Width": "Широчина",
126+
"full width": "Пълна ширина"
122127
}

0 commit comments

Comments
 (0)