Skip to content

Commit 0cf313a

Browse files
committed
Merge branch 'development' into release
2 parents 26aadff + ac27e18 commit 0cf313a

Some content is hidden

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

73 files changed

+2538
-784
lines changed

.github/translators.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,3 +449,7 @@ Avishay Rapp (AvishayRapp) :: Hebrew
449449
matthias4217 :: French
450450
Berke BOYLU2 (berkeboylu2) :: Turkish
451451
etwas7B :: German
452+
Mohammed srhiri (m.sghiri20) :: Arabic
453+
YongMin Kim (kym0118) :: Korean
454+
Rivo Zängov (Eraser) :: Estonian
455+
Francisco Rafael Fonseca (chicoraf) :: Portuguese, Brazilian

app/Console/Commands/UpdateUrlCommand.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public function handle(Connection $db): int
4949
'chapters' => ['description_html'],
5050
'books' => ['description_html'],
5151
'bookshelves' => ['description_html'],
52+
'page_revisions' => ['html', 'text', 'markdown'],
5253
'images' => ['url'],
5354
'settings' => ['value'],
5455
'comments' => ['html', 'text'],
@@ -77,6 +78,12 @@ public function handle(Connection $db): int
7778
$this->info('URL update procedure complete.');
7879
$this->info('============================================================================');
7980
$this->info('Be sure to run "php artisan cache:clear" to clear any old URLs in the cache.');
81+
82+
if (!str_starts_with($newUrl, url('/'))) {
83+
$this->warn('You still need to update your APP_URL env value. This is currently set to:');
84+
$this->warn(url('/'));
85+
}
86+
8087
$this->info('============================================================================');
8188

8289
return 0;

app/Settings/SettingController.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
class SettingController extends Controller
1111
{
12-
protected array $settingCategories = ['features', 'customization', 'registration'];
13-
1412
/**
1513
* Handle requests to the settings index path.
1614
*/
@@ -31,7 +29,7 @@ public function category(string $category)
3129
// Get application version
3230
$version = trim(file_get_contents(base_path('version')));
3331

34-
return view('settings.' . $category, [
32+
return view('settings.categories.' . $category, [
3533
'category' => $category,
3634
'version' => $version,
3735
'guestUser' => User::getGuest(),
@@ -59,7 +57,7 @@ public function update(Request $request, AppSettingsStore $store, string $catego
5957

6058
protected function ensureCategoryExists(string $category): void
6159
{
62-
if (!in_array($category, $this->settingCategories)) {
60+
if (!view()->exists('settings.categories.' . $category)) {
6361
abort(404);
6462
}
6563
}

app/Translation/LocaleManager.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class LocaleManager
6060
'sq' => 'sq_AL',
6161
'sr' => 'sr_RS',
6262
'sv' => 'sv_SE',
63+
'tk' => 'tk_TM',
6364
'tr' => 'tr_TR',
6465
'uk' => 'uk_UA',
6566
'uz' => 'uz_UZ',

app/Users/Controllers/UserApiController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected function rules(int $userId = null): array
3737
{
3838
return [
3939
'create' => [
40-
'name' => ['required', 'string', 'min:2', 'max:100'],
40+
'name' => ['required', 'string', 'min:1', 'max:100'],
4141
'email' => [
4242
'required', 'string', 'email', 'min:2', new Unique('users', 'email'),
4343
],
@@ -49,7 +49,7 @@ protected function rules(int $userId = null): array
4949
'send_invite' => ['boolean'],
5050
],
5151
'update' => [
52-
'name' => ['string', 'min:2', 'max:100'],
52+
'name' => ['string', 'min:1', 'max:100'],
5353
'email' => [
5454
'string',
5555
'email',

app/Users/Controllers/UserController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public function update(Request $request, int $id)
144144
$this->checkPermission('users-manage');
145145

146146
$validated = $this->validate($request, [
147-
'name' => ['min:2', 'max:100'],
147+
'name' => ['min:1', 'max:100'],
148148
'email' => ['min:2', 'email', 'unique:users,email,' . $id],
149149
'password' => ['required_with:password_confirm', Password::default()],
150150
'password-confirm' => ['same:password', 'required_with:password'],

bookstack-system-cli

29.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)