1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-06 12:02:45 +03:00

Merge branch 'tinymce' into development

This commit is contained in:
Dan Brown
2022-02-08 15:28:56 +00:00
162 changed files with 5012 additions and 6595 deletions

View File

@@ -206,7 +206,6 @@ Route::middleware('auth')->group(function () {
// Other Pages
Route::get('/', [HomeController::class, 'index']);
Route::get('/home', [HomeController::class, 'index']);
Route::get('/custom-head-content', [HomeController::class, 'customHeadContent']);
// Settings
Route::get('/settings', [SettingController::class, 'index'])->name('settings');
@@ -322,12 +321,15 @@ Route::get('/oidc/callback', [Auth\OidcController::class, 'callback']);
Route::get('/register/invite/{token}', [Auth\UserInviteController::class, 'showSetPassword']);
Route::post('/register/invite/{token}', [Auth\UserInviteController::class, 'setPassword']);
// Password reset link request routes...
// Password reset link request routes
Route::get('/password/email', [Auth\ForgotPasswordController::class, 'showLinkRequestForm']);
Route::post('/password/email', [Auth\ForgotPasswordController::class, 'sendResetLinkEmail']);
// Password reset routes...
// Password reset routes
Route::get('/password/reset/{token}', [Auth\ResetPasswordController::class, 'showResetForm']);
Route::post('/password/reset', [Auth\ResetPasswordController::class, 'reset']);
// Metadata routes
Route::view('/help/wysiwyg', 'help.wysiwyg');
Route::fallback([HomeController::class, 'notFound'])->name('fallback');