Skip to content

Commit becc630

Browse files
ssddanbrownssddanbrown
committed
Merge branch 'development' into release
2 parents 4ac8eca + 8063514 commit becc630

File tree

687 files changed

+6947
-3664
lines changed

Some content is hidden

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

687 files changed

+6947
-3664
lines changed

‎.env.example‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ MAIL_FROM=bookstack@example.com
3737
# SMTP mail options
3838
# These settings can be checked using the "Send a Test Email"
3939
# feature found in the "Settings > Maintenance" area of the system.
40+
# For more detailed documentation on mail options, refer to:
41+
# https://www.bookstackapp.com/docs/admin/email-webhooks/#email-configuration
4042
MAIL_HOST=localhost
41-
MAIL_PORT=1025
43+
MAIL_PORT=587
4244
MAIL_USERNAME=null
4345
MAIL_PASSWORD=null
4446
MAIL_ENCRYPTION=null

‎.env.example.complete‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,19 @@ DB_PASSWORD=database_user_password
6969
# certificate itself (Common Name or Subject Alternative Name).
7070
MYSQL_ATTR_SSL_CA="/path/to/ca.pem"
7171

72-
# Mail system to use
73-
# Can be 'smtp' or 'sendmail'
72+
# Mail configuration
73+
# Refer to https://www.bookstackapp.com/docs/admin/email-webhooks/#email-configuration
7474
MAIL_DRIVER=smtp
75-
76-
# Mail sending options
7775
MAIL_FROM=mail@bookstackapp.com
7876
MAIL_FROM_NAME=BookStack
7977

80-
# SMTP mail options
8178
MAIL_HOST=localhost
82-
MAIL_PORT=1025
79+
MAIL_PORT=587
8380
MAIL_USERNAME=null
8481
MAIL_PASSWORD=null
8582
MAIL_ENCRYPTION=null
8683
MAIL_VERIFY_SSL=true
8784

88-
# Command to use when email is sent via sendmail
8985
MAIL_SENDMAIL_COMMAND="/usr/sbin/sendmail -bs"
9086

9187
# Cache & Session driver to use

‎.github/translators.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,3 +333,11 @@ Patrick Dantas (pa-tiq) :: Portuguese, Brazilian
333333
Michal (michalgurcik) :: Slovak
334334
Nepomacs :: German
335335
Rubens (rubenix) :: Catalan
336+
m4z :: German; German Informal
337+
TheRazvy :: Romanian
338+
Yossi Zilber (lortens) :: Hebrew; Uzbek
339+
desdinova :: French
340+
Ingus Rūķis (ingus.rukis) :: Latvian
341+
Eugene Pershin (SilentEugene) :: Russian
342+
周盛道 (zhoushengdao) :: Chinese Simplified
343+
hamidreza amini (hamidrezaamini2022) :: Persian

app/Http/Controllers/Auth/ConfirmEmailController.php renamed to app/Access/Controllers/ConfirmEmailController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace BookStack\Http\Controllers\Auth;
3+
namespace BookStack\Access\Controllers;
44

5-
use BookStack\Auth\Access\EmailConfirmationService;
6-
use BookStack\Auth\Access\LoginService;
7-
use BookStack\Auth\UserRepo;
5+
use BookStack\Access\EmailConfirmationService;
6+
use BookStack\Access\LoginService;
87
use BookStack\Exceptions\ConfirmationEmailException;
98
use BookStack\Exceptions\UserTokenExpiredException;
109
use BookStack\Exceptions\UserTokenNotFoundException;
11-
use BookStack\Http\Controllers\Controller;
10+
use BookStack\Http\Controller;
11+
use BookStack\Users\UserRepo;
1212
use Exception;
1313
use Illuminate\Http\Request;
1414

app/Http/Controllers/Auth/ForgotPasswordController.php renamed to app/Access/Controllers/ForgotPasswordController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
namespace BookStack\Http\Controllers\Auth;
3+
namespace BookStack\Access\Controllers;
44

5-
use BookStack\Actions\ActivityType;
6-
use BookStack\Http\Controllers\Controller;
5+
use BookStack\Activity\ActivityType;
6+
use BookStack\Http\Controller;
77
use Illuminate\Http\Request;
88
use Illuminate\Support\Facades\Password;
99

app/Http/Controllers/Auth/HandlesPartialLogins.php renamed to app/Access/Controllers/HandlesPartialLogins.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace BookStack\Http\Controllers\Auth;
3+
namespace BookStack\Access\Controllers;
44

5-
use BookStack\Auth\Access\LoginService;
6-
use BookStack\Auth\User;
5+
use BookStack\Access\LoginService;
76
use BookStack\Exceptions\NotFoundException;
7+
use BookStack\Users\Models\User;
88

99
trait HandlesPartialLogins
1010
{

app/Http/Controllers/Auth/LoginController.php renamed to app/Access/Controllers/LoginController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

3-
namespace BookStack\Http\Controllers\Auth;
3+
namespace BookStack\Access\Controllers;
44

5-
use BookStack\Auth\Access\LoginService;
6-
use BookStack\Auth\Access\SocialAuthService;
5+
use BookStack\Access\LoginService;
6+
use BookStack\Access\SocialAuthService;
77
use BookStack\Exceptions\LoginAttemptEmailNeededException;
88
use BookStack\Exceptions\LoginAttemptException;
99
use BookStack\Facades\Activity;
10-
use BookStack\Http\Controllers\Controller;
10+
use BookStack\Http\Controller;
1111
use Illuminate\Http\RedirectResponse;
1212
use Illuminate\Http\Request;
1313
use Illuminate\Support\Facades\Auth;

app/Http/Controllers/Auth/MfaBackupCodesController.php renamed to app/Access/Controllers/MfaBackupCodesController.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace BookStack\Http\Controllers\Auth;
3+
namespace BookStack\Access\Controllers;
44

5-
use BookStack\Actions\ActivityType;
6-
use BookStack\Auth\Access\LoginService;
7-
use BookStack\Auth\Access\Mfa\BackupCodeService;
8-
use BookStack\Auth\Access\Mfa\MfaSession;
9-
use BookStack\Auth\Access\Mfa\MfaValue;
5+
use BookStack\Access\LoginService;
6+
use BookStack\Access\Mfa\BackupCodeService;
7+
use BookStack\Access\Mfa\MfaSession;
8+
use BookStack\Access\Mfa\MfaValue;
9+
use BookStack\Activity\ActivityType;
1010
use BookStack\Exceptions\NotFoundException;
11-
use BookStack\Http\Controllers\Controller;
11+
use BookStack\Http\Controller;
1212
use Exception;
1313
use Illuminate\Http\Request;
1414
use Illuminate\Validation\ValidationException;

app/Http/Controllers/Auth/MfaController.php renamed to app/Access/Controllers/MfaController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace BookStack\Http\Controllers\Auth;
3+
namespace BookStack\Access\Controllers;
44

5-
use BookStack\Actions\ActivityType;
6-
use BookStack\Auth\Access\Mfa\MfaValue;
7-
use BookStack\Http\Controllers\Controller;
5+
use BookStack\Access\Mfa\MfaValue;
6+
use BookStack\Activity\ActivityType;
7+
use BookStack\Http\Controller;
88
use Illuminate\Http\Request;
99

1010
class MfaController extends Controller

app/Http/Controllers/Auth/MfaTotpController.php renamed to app/Access/Controllers/MfaTotpController.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22

3-
namespace BookStack\Http\Controllers\Auth;
4-
5-
use BookStack\Actions\ActivityType;
6-
use BookStack\Auth\Access\LoginService;
7-
use BookStack\Auth\Access\Mfa\MfaSession;
8-
use BookStack\Auth\Access\Mfa\MfaValue;
9-
use BookStack\Auth\Access\Mfa\TotpService;
10-
use BookStack\Auth\Access\Mfa\TotpValidationRule;
3+
namespace BookStack\Access\Controllers;
4+
5+
use BookStack\Access\LoginService;
6+
use BookStack\Access\Mfa\MfaSession;
7+
use BookStack\Access\Mfa\MfaValue;
8+
use BookStack\Access\Mfa\TotpService;
9+
use BookStack\Access\Mfa\TotpValidationRule;
10+
use BookStack\Activity\ActivityType;
1111
use BookStack\Exceptions\NotFoundException;
12-
use BookStack\Http\Controllers\Controller;
12+
use BookStack\Http\Controller;
1313
use Illuminate\Http\Request;
1414
use Illuminate\Validation\ValidationException;
1515

0 commit comments

Comments
 (0)