starred/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-02-05 08:39:55 +03:00
Code Issues 784 Packages Projects Releases 10 Wiki Activity

Search: An unknown error occurred #3354

New Issue
Closed
opened 2026-02-05 06:26:48 +03:00 by OVERLORD · 23 comments
OVERLORD commented 2026-02-05 06:26:48 +03:00
Owner
Copy Link

Originally created by @helson22 on GitHub (Nov 18, 2022).

Attempted Debugging

  • I have read the debugging page

Searched GitHub Issues

  • I have searched GitHub for the issue.

Describe the Scenario

Afteer Update to latest v22.10.2 search shouts at me with "An unknown error occurred". Also, when trying to create a link in HTML Editor an search for existing content/link - the some content is displayed but search within this dialogou only shows the falling dots.

In the logs section below I posted log-file contents after doeing a search. I treid to do the update procedure a second time. The console output is also shown below.

Exact BookStack Version

v22.10.2

Log Content

[2022-11-15 08:40:33] production.ERROR: SQLSTATE[42S22]: Column not found: 1054 Unknown column 'restricted' in 'field list' (SQL: select `name`, `id`, `slug`, `book_id`, `chapter_id`, `draft`, `template`, `text`, `created_at`, `updated_at`, `priority`, `restricted`, `owned_by`, `s`.`score`, (select `slug` from `books` where `books`.`id` = `book_id`) as `book_slug` from `pages` inner join (select `entity_id`, `entity_type`, SUM(IF(term like eeee%, score * 0.3, 0)) as score from `search_terms` where `entity_type` = page and (`term` like eeee%) group by `entity_type`, `entity_id`) as `s` on `id` = `entity_id` where (`draft` = 0 or (`draft` = 1 and `owned_by` = 3)) and (exists (select * from `joint_permissions` where `pages`.`id` = `joint_permissions`.`entity_id` and `joint_permissions`.`entity_type` = page and `role_id` in (1) and (`joint_permissions`.`has_permission` = 1 or (`joint_permissions`.`has_permission_own` = 1 and `joint_permissions`.`owned_by` = 3)))) and `pages`.`deleted_at` is null order by `score` desc limit 20 offset 0) {"userId":3,"exception":"[object] (Illuminate\\Database\\QueryException(code: 42S22): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'restricted' in 'field list' (SQL: select `name`, `id`, `slug`, `book_id`, `chapter_id`, `draft`, `template`, `text`, `created_at`, `updated_at`, `priority`, `restricted`, `owned_by`, `s`.`score`, (select `slug` from `books` where `books`.`id` = `book_id`) as `book_slug` from `pages` inner join (select `entity_id`, `entity_type`, SUM(IF(term like eeee%, score * 0.3, 0)) as score from `search_terms` where `entity_type` = page and (`term` like eeee%) group by `entity_type`, `entity_id`) as `s` on `id` = `entity_id` where (`draft` = 0 or (`draft` = 1 and `owned_by` = 3)) and (exists (select * from `joint_permissions` where `pages`.`id` = `joint_permissions`.`entity_id` and `joint_permissions`.`entity_type` = page and `role_id` in (1) and (`joint_permissions`.`has_permission` = 1 or (`joint_permissions`.`has_permission_own` = 1 and `joint_permissions`.`owned_by` = 3)))) and `pages`.`deleted_at` is null order by `score` desc limit 20 offset 0) at /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php:712)
[stacktrace]
#0 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(672): Illuminate\\Database\\Connection->runQueryCallback()
#1 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(376): Illuminate\\Database\\Connection->run()
#2 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2414): Illuminate\\Database\\Connection->select()
#3 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2402): Illuminate\\Database\\Query\\Builder->runSelect()
#4 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2936): Illuminate\\Database\\Query\\Builder->Illuminate\\Database\\Query\\{closure}()
#5 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2403): Illuminate\\Database\\Query\\Builder->onceWithColumns()
#6 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php(625): Illuminate\\Database\\Query\\Builder->get()
#7 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php(609): Illuminate\\Database\\Eloquent\\Builder->getModels()
#8 /var/www/bookstack/app/Search/SearchRunner.php(154): Illuminate\\Database\\Eloquent\\Builder->get()
#9 /var/www/bookstack/app/Search/SearchRunner.php(78): BookStack\\Search\\SearchRunner->getPageOfDataFromQuery()
#10 /var/www/bookstack/app/Http/Controllers/SearchController.php(33): BookStack\\Search\\SearchRunner->searchEntities()
#11 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Controller.php(54): BookStack\\Http\\Controllers\\SearchController->search()
#12 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php(45): Illuminate\\Routing\\Controller->callAction()
#13 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Route.php(262): Illuminate\\Routing\\ControllerDispatcher->dispatch()
#14 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Route.php(205): Illuminate\\Routing\\Route->runController()
#15 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(721): Illuminate\\Routing\\Route->run()
#16 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(128): Illuminate\\Routing\\Router->Illuminate\\Routing\\{closure}()
#17 /var/www/bookstack/app/Http/Middleware/Authenticate.php(23): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#18 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\Authenticate->handle()
#19 /var/www/bookstack/app/Http/Middleware/Localization.php(45): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#20 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\Localization->handle()
#21 /var/www/bookstack/app/Http/Middleware/RunThemeActions.php(26): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#22 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\RunThemeActions->handle()
#23 /var/www/bookstack/app/Http/Middleware/CheckEmailConfirmed.php(47): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#24 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\CheckEmailConfirmed->handle()
#25 /var/www/bookstack/app/Http/Middleware/PreventAuthenticatedResponseCaching.php(21): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#26 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\PreventAuthenticatedResponseCaching->handle()
#27 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php(78): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#28 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\VerifyCsrfToken->handle()
#29 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php(49): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#30 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\View\\Middleware\\ShareErrorsFromSession->handle()
#31 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(121): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#32 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(64): Illuminate\\Session\\Middleware\\StartSession->handleStatefulRequest()
#33 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Session\\Middleware\\StartSession->handle()
#34 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php(37): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#35 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Cookie\\Middleware\\AddQueuedCookiesToResponse->handle()
#36 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php(67): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#37 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Cookie\\Middleware\\EncryptCookies->handle()
#38 /var/www/bookstack/app/Http/Middleware/ApplyCspRules.php(33): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#39 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\ApplyCspRules->handle()
#40 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(103): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#41 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(723): Illuminate\\Pipeline\\Pipeline->then()
#42 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(698): Illuminate\\Routing\\Router->runRouteWithinStack()
#43 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(662): Illuminate\\Routing\\Router->runRoute()
#44 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(651): Illuminate\\Routing\\Router->dispatchToRoute()
#45 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(167): Illuminate\\Routing\\Router->dispatch()
#46 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(128): Illuminate\\Foundation\\Http\\Kernel->Illuminate\\Foundation\\Http\\{closure}()
#47 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Http/Middleware/TrustProxies.php(39): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#48 /var/www/bookstack/app/Http/Middleware/TrustProxies.php(41): Illuminate\\Http\\Middleware\\TrustProxies->handle()
#49 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\TrustProxies->handle()
#50 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(21): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#51 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php(40): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle()
#52 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\TrimStrings->handle()
#53 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ValidatePostSize.php(27): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#54 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\ValidatePostSize->handle()
#55 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/PreventRequestsDuringMaintenance.php(86): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#56 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\PreventRequestsDuringMaintenance->handle()
#57 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(103): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#58 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(142): Illuminate\\Pipeline\\Pipeline->then()
#59 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(111): Illuminate\\Foundation\\Http\\Kernel->sendRequestThroughRouter()
#60 /var/www/bookstack/public/index.php(53): Illuminate\\Foundation\\Http\\Kernel->handle()
#61 {main}

[previous exception] [object] (PDOException(code: 42S22): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'restricted' in 'field list' at /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php:368)
[stacktrace]
#0 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(368): PDO->prepare()
#1 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(705): Illuminate\\Database\\Connection->Illuminate\\Database\\{closure}()
#2 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(672): Illuminate\\Database\\Connection->runQueryCallback()
#3 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(376): Illuminate\\Database\\Connection->run()
#4 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2414): Illuminate\\Database\\Connection->select()
#5 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2402): Illuminate\\Database\\Query\\Builder->runSelect()
#6 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2936): Illuminate\\Database\\Query\\Builder->Illuminate\\Database\\Query\\{closure}()
#7 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2403): Illuminate\\Database\\Query\\Builder->onceWithColumns()
#8 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php(625): Illuminate\\Database\\Query\\Builder->get()
#9 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php(609): Illuminate\\Database\\Eloquent\\Builder->getModels()
#10 /var/www/bookstack/app/Search/SearchRunner.php(154): Illuminate\\Database\\Eloquent\\Builder->get()
#11 /var/www/bookstack/app/Search/SearchRunner.php(78): BookStack\\Search\\SearchRunner->getPageOfDataFromQuery()
#12 /var/www/bookstack/app/Http/Controllers/SearchController.php(33): BookStack\\Search\\SearchRunner->searchEntities()
#13 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Controller.php(54): BookStack\\Http\\Controllers\\SearchController->search()
#14 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php(45): Illuminate\\Routing\\Controller->callAction()
#15 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Route.php(262): Illuminate\\Routing\\ControllerDispatcher->dispatch()
#16 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Route.php(205): Illuminate\\Routing\\Route->runController()
#17 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(721): Illuminate\\Routing\\Route->run()
#18 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(128): Illuminate\\Routing\\Router->Illuminate\\Routing\\{closure}()
#19 /var/www/bookstack/app/Http/Middleware/Authenticate.php(23): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#20 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\Authenticate->handle()
#21 /var/www/bookstack/app/Http/Middleware/Localization.php(45): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#22 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\Localization->handle()
#23 /var/www/bookstack/app/Http/Middleware/RunThemeActions.php(26): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#24 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\RunThemeActions->handle()
#25 /var/www/bookstack/app/Http/Middleware/CheckEmailConfirmed.php(47): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#26 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\CheckEmailConfirmed->handle()
#27 /var/www/bookstack/app/Http/Middleware/PreventAuthenticatedResponseCaching.php(21): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#28 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\PreventAuthenticatedResponseCaching->handle()
#29 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php(78): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#30 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\VerifyCsrfToken->handle()
#31 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php(49): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#32 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\View\\Middleware\\ShareErrorsFromSession->handle()
#33 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(121): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#34 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(64): Illuminate\\Session\\Middleware\\StartSession->handleStatefulRequest()
#35 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Session\\Middleware\\StartSession->handle()
#36 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php(37): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#37 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Cookie\\Middleware\\AddQueuedCookiesToResponse->handle()
#38 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php(67): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#39 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Cookie\\Middleware\\EncryptCookies->handle()
#40 /var/www/bookstack/app/Http/Middleware/ApplyCspRules.php(33): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#41 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\ApplyCspRules->handle()
#42 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(103): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#43 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(723): Illuminate\\Pipeline\\Pipeline->then()
#44 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(698): Illuminate\\Routing\\Router->runRouteWithinStack()
#45 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(662): Illuminate\\Routing\\Router->runRoute()
#46 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(651): Illuminate\\Routing\\Router->dispatchToRoute()
#47 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(167): Illuminate\\Routing\\Router->dispatch()
#48 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(128): Illuminate\\Foundation\\Http\\Kernel->Illuminate\\Foundation\\Http\\{closure}()
#49 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Http/Middleware/TrustProxies.php(39): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#50 /var/www/bookstack/app/Http/Middleware/TrustProxies.php(41): Illuminate\\Http\\Middleware\\TrustProxies->handle()
#51 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\TrustProxies->handle()
#52 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(21): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#53 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php(40): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle()
#54 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\TrimStrings->handle()
#55 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ValidatePostSize.php(27): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#56 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\ValidatePostSize->handle()
#57 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/PreventRequestsDuringMaintenance.php(86): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#58 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\PreventRequestsDuringMaintenance->handle()
#59 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(103): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}()
#60 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(142): Illuminate\\Pipeline\\Pipeline->then()
#61 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(111): Illuminate\\Foundation\\Http\\Kernel->sendRequestThroughRouter()
#62 /var/www/bookstack/public/index.php(53): Illuminate\\Foundation\\Http\\Kernel->handle()
#63 {main}
"}

XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ git pull origin release
From https://github.com/BookStackApp/BookStack
 * branch              release    -> FETCH_HEAD
Updating 2ac9efae..edb0c6a9
error: Your local changes to the following files would be overwritten by merge:
        .github/translators.txt
        .github/workflows/test-migrations.yml
        LICENSE
        app/Actions/TagRepo.php
        app/Actions/Webhook.php
        app/Actions/WebhookTrackedEvent.php
        app/Api/ListingResponseBuilder.php
        app/Auth/Access/LdapService.php
        app/Auth/Access/LoginService.php
        app/Auth/Access/Oidc/OidcService.php
        app/Auth/Access/Saml2Service.php
        app/Auth/Permissions/EntityPermission.php
        app/Auth/Permissions/JointPermissionBuilder.php
        app/Auth/Permissions/PermissionApplicator.php
        app/Auth/Permissions/PermissionsRepo.php
        app/Auth/Permissions/SimpleEntityData.php
        app/Auth/Role.php
        app/Auth/UserRepo.php
        app/Config/app.php
        app/Config/dompdf.php
        app/Config/snappy.php
        app/Console/Commands/CopyShelfPermissions.php
        app/Entities/Models/Book.php
        app/Entities/Models/Bookshelf.php
        app/Entities/Models/Chapter.php
        app/Entities/Models/Entity.php
        app/Entities/Models/Page.php
        app/Entities/Models/PageRevision.php
        app/Entities/Repos/BookshelfRepo.php
        app/Entities/Tools/BookContents.php
        app/Entities/Tools/Cloner.php
        app/Entities/Tools/HierarchyTransformer.php
        app/Entities/Tools/PageEditActivity.php
        app/Entities/Tools/PermissionsUpdater.php
        app/Http/Controllers/Api/BookApiController.php
        app/Http/Controllers/Api/BookshelfApiController.php
        app/Http/Controllers/Api/SearchApiController.php
        app/Http/Controllers/Auth/ConfirmEmailController.php
        app/Http/Controllers/Auth/ForgotPasswordController.php
        app/Http/Controllers/Auth/LoginController.php
        app/Http/Controllers/Auth/RegisterController.php
        app/Http/Controllers/Auth/ResetPasswordController.php
        app/Http/Controllers/Auth/Saml2Controller.php
        app/Http/Controllers/Auth/SocialController.php
        app/Http/Controllers/Auth/UserInviteController.php
        app/Http/Controllers/BookController.php
        app/Http/Controllers/BookSortController.php
        app/Http/Controllers/BookshelfController.php
        app/Http/Controllers/ChapterController.php
        app/Http/Controllers/FavouriteController.php
        app/Http/Controllers/PageController.php
        app/Http/Controllers/PageRevisionController.php
        app/Http/Controllers/ReferenceController.php
        app/Http/Controllers/TagController.php
        app/Providers/AppServiceProvider.php
        app/Providers/AuthServiceProvider.php
        app/Providers/EventServiceProvider.php
        app/Providers/ThemeServiceProvider.php
        app/Uploads/ImageService.php
        app/Util/LanguageManager.php
        composer.json
        composer.lock
        dev/api/responses/books-read.json
        public/dist/app.js
        public/dist/code.js
        public/dist/export-styles.css
        public/dist/styles.css
        readme.md
        resources/js/code.mjs
        resources/js/components/auto-suggest.js
        resources/js/components/index.js
        resources/js/components/page-display.js
        resources/js/components/permissions-table.js
        resources/js/components/shelf-sort.js
        resources/js/services/dom.js
        resources/js/wysiwyg/config.js
        resources/js/wysiwyg/plugin-codeeditor.js
        resources/lang/ar/activities.php
        resources/lang/ar/auth.php
        resources/lang/ar/editor.php
        resources/lang/ar/entities.php
        resources/lang/ar/settings.php
        resources/lang/bg/editor.php
        resources/lang/bg/entities.php
        resources/lang/bg/settings.php
        resources/lang/bs/editor.php
        resources/lang/bs/entities.php
        resources/lang/bs/settings.php
        resources/lang/ca/editor.php
        resources/lang/ca/entities.php
        resources/lang/ca/settings.php
        resources/lang/cs/activities.php
        resources/lang/cs/editor.php
        resources/lang/cs/entities.php
        resources/lang/cs/settings.php
        resources/lang/cy/editor.php
        resources/lang/cy/entities.php
        resources/lang/cy/settings.php
        resources/lang/da/editor.php
        resources/lang/da/entities.php
        resources/lang/da/settings.php
        resources/lang/de/activities.php
        resources/lang/de/auth.php
        resources/lang/de/components.php
        resources/lang/de/editor.php
        resources/lang/de/entities.php
        resources/lang/de/errors.php
        resources/lang/de/settings.php
        resources/lang/de/validation.php
        resources/lang/de_informal/activities.php
        resources/lang/de_informal/auth.php
        resources/lang/de_informal/common.php
        resources/lang/de_informal/editor.php
        resources/lang/de_informa
error: The following untracked working tree files would be overwritten by merge:
        .github/workflows/analyse-php.yml
        .github/workflows/lint-php.yml
        .github/workflows/test-php.yml
        app/Api/ApiEntityListFormatter.php
        app/Auth/Permissions/PermissionFormData.php
        app/Http/Controllers/Auth/ThrottlesLogins.php
        app/Http/Controllers/PermissionsController.php
        app/Providers/ValidationRuleServiceProvider.php
        app/Providers/ViewTweaksServiceProvider.php
        database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php
        database/migrations/2022_10_08_104202_drop_entity_restricted_field.php
        dev/docs/development.md
        dev/docs/javascript-code.md
        dev/docs/release-process.md
        phpcs.xml
        resources/icons/groups.svg
        resources/icons/role.svg
        resources/js/components/entity-permissions.js
        resources/js/components/pointer.js
        resources/js/wysiwyg/icons.js
        resources/lang/el/activities.php
        resources/lang/el/auth.php
        resources/lang/el/common.php
        resources/lang/el/components.php
        resources/lang/el/editor.php
        resources/lang/el/entities.php
        resources/lang/el/errors.php
        resources/lang/el/pagination.php
        resources/lang/el/passwords.php
        resources/lang/el/settings.php
        resources/lang/el/validation.php
        resources/views/form/entity-permissions-row.blade.php
        tests/Auth/RegistrationTest.php
        tests/Auth/ResetPasswordTest.php
        tests/Helpers/EntityProvider.php
        tests/Helpers/TestServiceProvider.php
Please move or remove them before you merge.
Aborting
XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ composer install --no-dev
> @php -r "!file_exists('bootstrap/cache/services.php') || @unlink('bootstrap/cache/services.php');"
Installing dependencies from lock file
Verifying lock file contents can be installed on current platform.
Nothing to install, update or remove
Package swiftmailer/swiftmailer is abandoned, you should avoid using it. Use symfony/mailer instead.
Generating optimized autoload files
> Illuminate\Foundation\ComposerScripts::postAutoloadDump
> @php artisan package:discover --ansi
Discovered Package: barryvdh/laravel-dompdf
Discovered Package: barryvdh/laravel-snappy
Discovered Package: intervention/image
Discovered Package: laravel/socialite
Discovered Package: laravel/tinker
Discovered Package: nesbot/carbon
Discovered Package: socialiteproviders/manager
Package manifest generated successfully.
59 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
`> @php artisan cache:clear
Failed to clear cache. Make sure you have the appropriate permissions.
> @php artisan view:clear
Compiled views cleared!
XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ php artisan migrate
**************************************
*     Application In Production!     *
**************************************

 Do you really wish to run this command? (yes/no) [no]:
 > yes

Nothing to migrate.
XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ sudo php artisan cache:clear
[sudo] password for XXXXXXXX:
Application cache cleared!
XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ php artisan config:clear
Configuration cache cleared!
XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ php artisan view:clear
Compiled views cleared!

PHP Version

8.1.2-1ubuntu2.8

Hosting Environment

Ubuntu 22.04.1 LTS

Originally created by @helson22 on GitHub (Nov 18, 2022). ### Attempted Debugging - [X] I have read the debugging page ### Searched GitHub Issues - [X] I have searched GitHub for the issue. ### Describe the Scenario Afteer Update to latest v22.10.2 search shouts at me with "An unknown error occurred". Also, when trying to create a link in HTML Editor an search for existing content/link - the some content is displayed but search within this dialogou only shows the falling dots. In the logs section below I posted log-file contents after doeing a search. I treid to do the update procedure a second time. The console output is also shown below. ### Exact BookStack Version v22.10.2 ### Log Content <details> ``` [2022-11-15 08:40:33] production.ERROR: SQLSTATE[42S22]: Column not found: 1054 Unknown column 'restricted' in 'field list' (SQL: select `name`, `id`, `slug`, `book_id`, `chapter_id`, `draft`, `template`, `text`, `created_at`, `updated_at`, `priority`, `restricted`, `owned_by`, `s`.`score`, (select `slug` from `books` where `books`.`id` = `book_id`) as `book_slug` from `pages` inner join (select `entity_id`, `entity_type`, SUM(IF(term like eeee%, score * 0.3, 0)) as score from `search_terms` where `entity_type` = page and (`term` like eeee%) group by `entity_type`, `entity_id`) as `s` on `id` = `entity_id` where (`draft` = 0 or (`draft` = 1 and `owned_by` = 3)) and (exists (select * from `joint_permissions` where `pages`.`id` = `joint_permissions`.`entity_id` and `joint_permissions`.`entity_type` = page and `role_id` in (1) and (`joint_permissions`.`has_permission` = 1 or (`joint_permissions`.`has_permission_own` = 1 and `joint_permissions`.`owned_by` = 3)))) and `pages`.`deleted_at` is null order by `score` desc limit 20 offset 0) {"userId":3,"exception":"[object] (Illuminate\\Database\\QueryException(code: 42S22): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'restricted' in 'field list' (SQL: select `name`, `id`, `slug`, `book_id`, `chapter_id`, `draft`, `template`, `text`, `created_at`, `updated_at`, `priority`, `restricted`, `owned_by`, `s`.`score`, (select `slug` from `books` where `books`.`id` = `book_id`) as `book_slug` from `pages` inner join (select `entity_id`, `entity_type`, SUM(IF(term like eeee%, score * 0.3, 0)) as score from `search_terms` where `entity_type` = page and (`term` like eeee%) group by `entity_type`, `entity_id`) as `s` on `id` = `entity_id` where (`draft` = 0 or (`draft` = 1 and `owned_by` = 3)) and (exists (select * from `joint_permissions` where `pages`.`id` = `joint_permissions`.`entity_id` and `joint_permissions`.`entity_type` = page and `role_id` in (1) and (`joint_permissions`.`has_permission` = 1 or (`joint_permissions`.`has_permission_own` = 1 and `joint_permissions`.`owned_by` = 3)))) and `pages`.`deleted_at` is null order by `score` desc limit 20 offset 0) at /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php:712) [stacktrace] #0 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(672): Illuminate\\Database\\Connection->runQueryCallback() #1 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(376): Illuminate\\Database\\Connection->run() #2 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2414): Illuminate\\Database\\Connection->select() #3 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2402): Illuminate\\Database\\Query\\Builder->runSelect() #4 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2936): Illuminate\\Database\\Query\\Builder->Illuminate\\Database\\Query\\{closure}() #5 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2403): Illuminate\\Database\\Query\\Builder->onceWithColumns() #6 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php(625): Illuminate\\Database\\Query\\Builder->get() #7 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php(609): Illuminate\\Database\\Eloquent\\Builder->getModels() #8 /var/www/bookstack/app/Search/SearchRunner.php(154): Illuminate\\Database\\Eloquent\\Builder->get() #9 /var/www/bookstack/app/Search/SearchRunner.php(78): BookStack\\Search\\SearchRunner->getPageOfDataFromQuery() #10 /var/www/bookstack/app/Http/Controllers/SearchController.php(33): BookStack\\Search\\SearchRunner->searchEntities() #11 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Controller.php(54): BookStack\\Http\\Controllers\\SearchController->search() #12 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php(45): Illuminate\\Routing\\Controller->callAction() #13 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Route.php(262): Illuminate\\Routing\\ControllerDispatcher->dispatch() #14 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Route.php(205): Illuminate\\Routing\\Route->runController() #15 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(721): Illuminate\\Routing\\Route->run() #16 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(128): Illuminate\\Routing\\Router->Illuminate\\Routing\\{closure}() #17 /var/www/bookstack/app/Http/Middleware/Authenticate.php(23): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #18 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\Authenticate->handle() #19 /var/www/bookstack/app/Http/Middleware/Localization.php(45): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #20 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\Localization->handle() #21 /var/www/bookstack/app/Http/Middleware/RunThemeActions.php(26): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #22 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\RunThemeActions->handle() #23 /var/www/bookstack/app/Http/Middleware/CheckEmailConfirmed.php(47): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #24 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\CheckEmailConfirmed->handle() #25 /var/www/bookstack/app/Http/Middleware/PreventAuthenticatedResponseCaching.php(21): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #26 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\PreventAuthenticatedResponseCaching->handle() #27 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php(78): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #28 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\VerifyCsrfToken->handle() #29 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php(49): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #30 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\View\\Middleware\\ShareErrorsFromSession->handle() #31 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(121): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #32 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(64): Illuminate\\Session\\Middleware\\StartSession->handleStatefulRequest() #33 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Session\\Middleware\\StartSession->handle() #34 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php(37): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #35 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Cookie\\Middleware\\AddQueuedCookiesToResponse->handle() #36 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php(67): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #37 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Cookie\\Middleware\\EncryptCookies->handle() #38 /var/www/bookstack/app/Http/Middleware/ApplyCspRules.php(33): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #39 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\ApplyCspRules->handle() #40 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(103): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #41 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(723): Illuminate\\Pipeline\\Pipeline->then() #42 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(698): Illuminate\\Routing\\Router->runRouteWithinStack() #43 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(662): Illuminate\\Routing\\Router->runRoute() #44 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(651): Illuminate\\Routing\\Router->dispatchToRoute() #45 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(167): Illuminate\\Routing\\Router->dispatch() #46 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(128): Illuminate\\Foundation\\Http\\Kernel->Illuminate\\Foundation\\Http\\{closure}() #47 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Http/Middleware/TrustProxies.php(39): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #48 /var/www/bookstack/app/Http/Middleware/TrustProxies.php(41): Illuminate\\Http\\Middleware\\TrustProxies->handle() #49 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\TrustProxies->handle() #50 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(21): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #51 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php(40): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle() #52 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\TrimStrings->handle() #53 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ValidatePostSize.php(27): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #54 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\ValidatePostSize->handle() #55 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/PreventRequestsDuringMaintenance.php(86): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #56 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\PreventRequestsDuringMaintenance->handle() #57 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(103): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #58 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(142): Illuminate\\Pipeline\\Pipeline->then() #59 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(111): Illuminate\\Foundation\\Http\\Kernel->sendRequestThroughRouter() #60 /var/www/bookstack/public/index.php(53): Illuminate\\Foundation\\Http\\Kernel->handle() #61 {main} [previous exception] [object] (PDOException(code: 42S22): SQLSTATE[42S22]: Column not found: 1054 Unknown column 'restricted' in 'field list' at /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php:368) [stacktrace] #0 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(368): PDO->prepare() #1 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(705): Illuminate\\Database\\Connection->Illuminate\\Database\\{closure}() #2 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(672): Illuminate\\Database\\Connection->runQueryCallback() #3 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Connection.php(376): Illuminate\\Database\\Connection->run() #4 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2414): Illuminate\\Database\\Connection->select() #5 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2402): Illuminate\\Database\\Query\\Builder->runSelect() #6 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2936): Illuminate\\Database\\Query\\Builder->Illuminate\\Database\\Query\\{closure}() #7 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php(2403): Illuminate\\Database\\Query\\Builder->onceWithColumns() #8 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php(625): Illuminate\\Database\\Query\\Builder->get() #9 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php(609): Illuminate\\Database\\Eloquent\\Builder->getModels() #10 /var/www/bookstack/app/Search/SearchRunner.php(154): Illuminate\\Database\\Eloquent\\Builder->get() #11 /var/www/bookstack/app/Search/SearchRunner.php(78): BookStack\\Search\\SearchRunner->getPageOfDataFromQuery() #12 /var/www/bookstack/app/Http/Controllers/SearchController.php(33): BookStack\\Search\\SearchRunner->searchEntities() #13 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Controller.php(54): BookStack\\Http\\Controllers\\SearchController->search() #14 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php(45): Illuminate\\Routing\\Controller->callAction() #15 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Route.php(262): Illuminate\\Routing\\ControllerDispatcher->dispatch() #16 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Route.php(205): Illuminate\\Routing\\Route->runController() #17 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(721): Illuminate\\Routing\\Route->run() #18 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(128): Illuminate\\Routing\\Router->Illuminate\\Routing\\{closure}() #19 /var/www/bookstack/app/Http/Middleware/Authenticate.php(23): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #20 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\Authenticate->handle() #21 /var/www/bookstack/app/Http/Middleware/Localization.php(45): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #22 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\Localization->handle() #23 /var/www/bookstack/app/Http/Middleware/RunThemeActions.php(26): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #24 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\RunThemeActions->handle() #25 /var/www/bookstack/app/Http/Middleware/CheckEmailConfirmed.php(47): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #26 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\CheckEmailConfirmed->handle() #27 /var/www/bookstack/app/Http/Middleware/PreventAuthenticatedResponseCaching.php(21): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #28 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\PreventAuthenticatedResponseCaching->handle() #29 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php(78): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #30 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\VerifyCsrfToken->handle() #31 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php(49): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #32 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\View\\Middleware\\ShareErrorsFromSession->handle() #33 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(121): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #34 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(64): Illuminate\\Session\\Middleware\\StartSession->handleStatefulRequest() #35 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Session\\Middleware\\StartSession->handle() #36 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php(37): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #37 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Cookie\\Middleware\\AddQueuedCookiesToResponse->handle() #38 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php(67): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #39 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Cookie\\Middleware\\EncryptCookies->handle() #40 /var/www/bookstack/app/Http/Middleware/ApplyCspRules.php(33): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #41 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\ApplyCspRules->handle() #42 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(103): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #43 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(723): Illuminate\\Pipeline\\Pipeline->then() #44 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(698): Illuminate\\Routing\\Router->runRouteWithinStack() #45 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(662): Illuminate\\Routing\\Router->runRoute() #46 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Routing/Router.php(651): Illuminate\\Routing\\Router->dispatchToRoute() #47 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(167): Illuminate\\Routing\\Router->dispatch() #48 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(128): Illuminate\\Foundation\\Http\\Kernel->Illuminate\\Foundation\\Http\\{closure}() #49 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Http/Middleware/TrustProxies.php(39): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #50 /var/www/bookstack/app/Http/Middleware/TrustProxies.php(41): Illuminate\\Http\\Middleware\\TrustProxies->handle() #51 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): BookStack\\Http\\Middleware\\TrustProxies->handle() #52 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(21): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #53 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php(40): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle() #54 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\TrimStrings->handle() #55 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ValidatePostSize.php(27): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #56 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\ValidatePostSize->handle() #57 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/PreventRequestsDuringMaintenance.php(86): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #58 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\PreventRequestsDuringMaintenance->handle() #59 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(103): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}() #60 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(142): Illuminate\\Pipeline\\Pipeline->then() #61 /var/www/bookstack/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(111): Illuminate\\Foundation\\Http\\Kernel->sendRequestThroughRouter() #62 /var/www/bookstack/public/index.php(53): Illuminate\\Foundation\\Http\\Kernel->handle() #63 {main} "} ``` </details> <details> ``` XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ git pull origin release From https://github.com/BookStackApp/BookStack * branch release -> FETCH_HEAD Updating 2ac9efae..edb0c6a9 error: Your local changes to the following files would be overwritten by merge: .github/translators.txt .github/workflows/test-migrations.yml LICENSE app/Actions/TagRepo.php app/Actions/Webhook.php app/Actions/WebhookTrackedEvent.php app/Api/ListingResponseBuilder.php app/Auth/Access/LdapService.php app/Auth/Access/LoginService.php app/Auth/Access/Oidc/OidcService.php app/Auth/Access/Saml2Service.php app/Auth/Permissions/EntityPermission.php app/Auth/Permissions/JointPermissionBuilder.php app/Auth/Permissions/PermissionApplicator.php app/Auth/Permissions/PermissionsRepo.php app/Auth/Permissions/SimpleEntityData.php app/Auth/Role.php app/Auth/UserRepo.php app/Config/app.php app/Config/dompdf.php app/Config/snappy.php app/Console/Commands/CopyShelfPermissions.php app/Entities/Models/Book.php app/Entities/Models/Bookshelf.php app/Entities/Models/Chapter.php app/Entities/Models/Entity.php app/Entities/Models/Page.php app/Entities/Models/PageRevision.php app/Entities/Repos/BookshelfRepo.php app/Entities/Tools/BookContents.php app/Entities/Tools/Cloner.php app/Entities/Tools/HierarchyTransformer.php app/Entities/Tools/PageEditActivity.php app/Entities/Tools/PermissionsUpdater.php app/Http/Controllers/Api/BookApiController.php app/Http/Controllers/Api/BookshelfApiController.php app/Http/Controllers/Api/SearchApiController.php app/Http/Controllers/Auth/ConfirmEmailController.php app/Http/Controllers/Auth/ForgotPasswordController.php app/Http/Controllers/Auth/LoginController.php app/Http/Controllers/Auth/RegisterController.php app/Http/Controllers/Auth/ResetPasswordController.php app/Http/Controllers/Auth/Saml2Controller.php app/Http/Controllers/Auth/SocialController.php app/Http/Controllers/Auth/UserInviteController.php app/Http/Controllers/BookController.php app/Http/Controllers/BookSortController.php app/Http/Controllers/BookshelfController.php app/Http/Controllers/ChapterController.php app/Http/Controllers/FavouriteController.php app/Http/Controllers/PageController.php app/Http/Controllers/PageRevisionController.php app/Http/Controllers/ReferenceController.php app/Http/Controllers/TagController.php app/Providers/AppServiceProvider.php app/Providers/AuthServiceProvider.php app/Providers/EventServiceProvider.php app/Providers/ThemeServiceProvider.php app/Uploads/ImageService.php app/Util/LanguageManager.php composer.json composer.lock dev/api/responses/books-read.json public/dist/app.js public/dist/code.js public/dist/export-styles.css public/dist/styles.css readme.md resources/js/code.mjs resources/js/components/auto-suggest.js resources/js/components/index.js resources/js/components/page-display.js resources/js/components/permissions-table.js resources/js/components/shelf-sort.js resources/js/services/dom.js resources/js/wysiwyg/config.js resources/js/wysiwyg/plugin-codeeditor.js resources/lang/ar/activities.php resources/lang/ar/auth.php resources/lang/ar/editor.php resources/lang/ar/entities.php resources/lang/ar/settings.php resources/lang/bg/editor.php resources/lang/bg/entities.php resources/lang/bg/settings.php resources/lang/bs/editor.php resources/lang/bs/entities.php resources/lang/bs/settings.php resources/lang/ca/editor.php resources/lang/ca/entities.php resources/lang/ca/settings.php resources/lang/cs/activities.php resources/lang/cs/editor.php resources/lang/cs/entities.php resources/lang/cs/settings.php resources/lang/cy/editor.php resources/lang/cy/entities.php resources/lang/cy/settings.php resources/lang/da/editor.php resources/lang/da/entities.php resources/lang/da/settings.php resources/lang/de/activities.php resources/lang/de/auth.php resources/lang/de/components.php resources/lang/de/editor.php resources/lang/de/entities.php resources/lang/de/errors.php resources/lang/de/settings.php resources/lang/de/validation.php resources/lang/de_informal/activities.php resources/lang/de_informal/auth.php resources/lang/de_informal/common.php resources/lang/de_informal/editor.php resources/lang/de_informa error: The following untracked working tree files would be overwritten by merge: .github/workflows/analyse-php.yml .github/workflows/lint-php.yml .github/workflows/test-php.yml app/Api/ApiEntityListFormatter.php app/Auth/Permissions/PermissionFormData.php app/Http/Controllers/Auth/ThrottlesLogins.php app/Http/Controllers/PermissionsController.php app/Providers/ValidationRuleServiceProvider.php app/Providers/ViewTweaksServiceProvider.php database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php database/migrations/2022_10_08_104202_drop_entity_restricted_field.php dev/docs/development.md dev/docs/javascript-code.md dev/docs/release-process.md phpcs.xml resources/icons/groups.svg resources/icons/role.svg resources/js/components/entity-permissions.js resources/js/components/pointer.js resources/js/wysiwyg/icons.js resources/lang/el/activities.php resources/lang/el/auth.php resources/lang/el/common.php resources/lang/el/components.php resources/lang/el/editor.php resources/lang/el/entities.php resources/lang/el/errors.php resources/lang/el/pagination.php resources/lang/el/passwords.php resources/lang/el/settings.php resources/lang/el/validation.php resources/views/form/entity-permissions-row.blade.php tests/Auth/RegistrationTest.php tests/Auth/ResetPasswordTest.php tests/Helpers/EntityProvider.php tests/Helpers/TestServiceProvider.php Please move or remove them before you merge. Aborting XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ composer install --no-dev > @php -r "!file_exists('bootstrap/cache/services.php') || @unlink('bootstrap/cache/services.php');" Installing dependencies from lock file Verifying lock file contents can be installed on current platform. Nothing to install, update or remove Package swiftmailer/swiftmailer is abandoned, you should avoid using it. Use symfony/mailer instead. Generating optimized autoload files > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover --ansi Discovered Package: barryvdh/laravel-dompdf Discovered Package: barryvdh/laravel-snappy Discovered Package: intervention/image Discovered Package: laravel/socialite Discovered Package: laravel/tinker Discovered Package: nesbot/carbon Discovered Package: socialiteproviders/manager Package manifest generated successfully. 59 packages you are using are looking for funding. Use the `composer fund` command to find out more! `> @php artisan cache:clear Failed to clear cache. Make sure you have the appropriate permissions. > @php artisan view:clear Compiled views cleared! XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ php artisan migrate ************************************** * Application In Production! * ************************************** Do you really wish to run this command? (yes/no) [no]: > yes Nothing to migrate. XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ sudo php artisan cache:clear [sudo] password for XXXXXXXX: Application cache cleared! XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ php artisan config:clear Configuration cache cleared! XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ php artisan view:clear Compiled views cleared! ``` </details> ### PHP Version 8.1.2-1ubuntu2.8 ### Hosting Environment Ubuntu 22.04.1 LTS
OVERLORD added the 🐕 Support label 2026-02-05 06:26:48 +03:00
OVERLORD commented 2026-02-05 06:27:01 +03:00
Author
Owner
Copy Link

@ssddanbrown commented on GitHub (Nov 18, 2022):

Hi @helson22,
It looks like the files of your instance are in a messy state, so the new version files are not being fully used.

  • How did you originally install this instance? (Follow a specific guide or use a specific script?)
  • Have you attempted to use custom code or attempted to use a development branch of code?
  • What is the current output from running git status within your BookStack directory?
  • What is the current output from running git log -n 1 within your BookStack directory?
@ssddanbrown commented on GitHub (Nov 18, 2022): Hi @helson22, It looks like the files of your instance are in a messy state, so the new version files are not being fully used. - How did you originally install this instance? (Follow a specific guide or use a specific script?) - Have you attempted to use custom code or attempted to use a development branch of code? - What is the current output from running `git status` within your BookStack directory? - What is the current output from running `git log -n 1` within your BookStack directory?
OVERLORD commented 2026-02-05 06:27:07 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Nov 18, 2022):

Hi Dan,

thanks for your fast reply :-)

I do all you suggest on your documentation-pages.

Installed with ubuntu script:
https://www.bookstackapp.com/docs/admin/installation/#ubuntu-2204

Updating like this:
https://www.bookstackapp.com/docs/admin/updates/

I do not anything from your second question.

git status gives:

XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ git status
On branch release
Your branch is behind 'origin/release' by 81 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   .github/translators.txt
        deleted:    .github/workflows/phpstan.yml
        deleted:    .github/workflows/phpunit.yml
        modified:   .github/workflows/test-migrations.yml
        modified:   LICENSE
        modified:   app/Actions/TagRepo.php
        modified:   app/Actions/Webhook.php
        modified:   app/Actions/WebhookTrackedEvent.php
        modified:   app/Api/ListingResponseBuilder.php
        modified:   app/Auth/Access/LdapService.php
        modified:   app/Auth/Access/LoginService.php
        modified:   app/Auth/Access/Oidc/OidcService.php
        modified:   app/Auth/Access/Saml2Service.php
        modified:   app/Auth/Permissions/EntityPermission.php
        modified:   app/Auth/Permissions/JointPermissionBuilder.php
        modified:   app/Auth/Permissions/PermissionApplicator.php
        modified:   app/Auth/Permissions/PermissionsRepo.php
        modified:   app/Auth/Permissions/SimpleEntityData.php
        modified:   app/Auth/Role.php
        modified:   app/Auth/UserRepo.php
        modified:   app/Config/app.php
        modified:   app/Config/dompdf.php
        modified:   app/Config/snappy.php
        modified:   app/Console/Commands/CopyShelfPermissions.php
        modified:   app/Entities/Models/Book.php
        modified:   app/Entities/Models/Bookshelf.php
        modified:   app/Entities/Models/Chapter.php
        modified:   app/Entities/Models/Entity.php
        modified:   app/Entities/Models/Page.php
        modified:   app/Entities/Models/PageRevision.php
        modified:   app/Entities/Repos/BookshelfRepo.php
        modified:   app/Entities/Tools/BookContents.php
        modified:   app/Entities/Tools/Cloner.php
        modified:   app/Entities/Tools/HierarchyTransformer.php
        modified:   app/Entities/Tools/PageEditActivity.php
        modified:   app/Entities/Tools/PermissionsUpdater.php
        modified:   app/Http/Controllers/Api/BookApiController.php
        modified:   app/Http/Controllers/Api/BookshelfApiController.php
        modified:   app/Http/Controllers/Api/SearchApiController.php
        modified:   app/Http/Controllers/Auth/ConfirmEmailController.php
        modified:   app/Http/Controllers/Auth/ForgotPasswordController.php
        modified:   app/Http/Controllers/Auth/LoginController.php
        modified:   app/Http/Controllers/Auth/RegisterController.php
        modified:   app/Http/Controllers/Auth/ResetPasswordController.php
        modified:   app/Http/Controllers/Auth/Saml2Controller.php
        modified:   app/Http/Controllers/Auth/SocialController.php
        modified:   app/Http/Controllers/Auth/UserInviteController.php
        modified:   app/Http/Controllers/BookController.php
        modified:   app/Http/Controllers/BookSortController.php
        modified:   app/Http/Controllers/BookshelfController.php
        modified:   app/Http/Controllers/ChapterController.php
        modified:   app/Http/Controllers/FavouriteController.php
        modified:   app/Http/Controllers/PageController.php
        modified:   app/Http/Controllers/PageRevisionController.php
        modified:   app/Http/Controllers/ReferenceController.php
        modified:   app/Http/Controllers/TagController.php
        modified:   app/Providers/AppServiceProvider.php
        modified:   app/Providers/AuthServiceProvider.php
        deleted:    app/Providers/BroadcastServiceProvider.php
        deleted:    app/Providers/CustomFacadeProvider.php
        deleted:    app/Providers/CustomValidationServiceProvider.php
        modified:   app/Providers/EventServiceProvider.php
        deleted:    app/Providers/PaginationServiceProvider.php
        modified:   app/Providers/ThemeServiceProvider.php
        modified:   app/Uploads/ImageService.php
        modified:   app/Util/LanguageManager.php
        modified:   composer.json
        modified:   composer.lock
        modified:   dev/api/responses/books-read.json
        deleted:    dev/docs/components.md
        modified:   public/dist/app.js
        modified:   public/dist/code.js
        modified:   public/dist/export-styles.css
        modified:   public/dist/styles.css
        deleted:    public/web.config
        modified:   readme.md
        modified:   resources/js/code.mjs
        modified:   resources/js/components/auto-suggest.js
        deleted:    resources/js/components/entity-permissions-editor.js
        modified:   resources/js/components/index.js
        modified:   resources/js/components/page-display.js
        modified:   resources/js/components/permissions-table.js
        modified:   resources/js/components/shelf-sort.js
        modified:   resources/js/services/dom.js
        modified:   resources/js/wysiwyg/config.js
        modified:   resources/js/wysiwyg/plugin-codeeditor.js
        modified:   resources/lang/ar/activities.php
        modified:   resources/lang/ar/auth.php
        modified:   resources/lang/ar/editor.php
        modified:   resources/lang/ar/entities.php
        modified:   resources/lang/ar/settings.php
        modified:   resources/lang/bg/editor.php
        modified:   resources/lang/bg/entities.php
        modified:   resources/lang/bg/settings.php
        modified:   resources/lang/bs/editor.php
        modified:   resources/lang/bs/entities.php
        modified:   resources/lang/bs/settings.php
        modified:   resources/lang/ca/editor.php
        modified:   resources/lang/ca/entities.php
        modified:   resources/lang/ca/settings.php
        modified:   resources/lang/cs/activities.php
        modified:   resources/lang/cs/editor.php
        modified:   resources/lang/cs/entities.php
        modified:   resources/lang/cs/settings.php
        modified:   resources/lang/cy/editor.php
        modified:   resources/lang/cy/entities.php
        modified:   resources/lang/cy/settings.php
        modified:   resources/lang/da/editor.php
        modified:   resources/lang/da/entities.php
        modified:   resources/lang/da/settings.php
        modified:   resources/lang/de/activities.php
        modified:   resources/lang/de/auth.php
        modified:   resources/lang/de/components.php
        modified:   resources/lang/de/editor.php
        modified:   resources/lang/de/entities.php
        modified:   resources/lang/de/errors.php
        modified:   resources/lang/de/settings.php
        modified:   resources/lang/de/validation.php
        modified:   resources/lang/de_informal/activities.php
        modified:   resources/lang/de_informal/auth.php
        modified:   resources/lang/de_informal/common.php
        modified:   resources/lang/de_informal/editor.php
        modified:   resources/lang/de_informal/entities.php
        modified:   resources/lang/de_informal/errors.php
        modified:   resources/lang/de_informal/settings.php
        modified:   resources/lang/en/editor.php
        modified:   resources/lang/en/entities.php
        modified:   resources/lang/en/settings.php
        modified:   resources/lang/es/editor.php
        modified:   resources/lang/es/entities.php
        modified:   resources/lang/es/settings.php
        modified:   resources/lang/es_AR/activities.php
        modified:   resources/lang/es_AR/editor.php
        modified:   resources/lang/es_AR/entities.php
        modified:   resources/lang/es_AR/settings.php
        modified:   resources/lang/et/activities.php
        modified:   resources/lang/et/editor.php
        modified:   resources/lang/et/entities.php
        modified:   resources/lang/et/errors.php
        modified:   resources/lang/et/settings.php
        modified:   resources/lang/eu/editor.php
        modified:   resources/lang/eu/entities.php
        modified:   resources/lang/eu/settings.php
        modified:   resources/lang/fa/activities.php
        modified:   resources/lang/fa/auth.php
        modified:   resources/lang/fa/editor.php
        modified:   resources/lang/fa/entities.php
        modified:   resources/lang/fa/errors.php
        modified:   resources/lang/fa/settings.php
        modified:   resources/lang/fr/activities.php
        modified:   resources/lang/fr/editor.php
        modified:   resources/lang/fr/entities.php
        modified:   resources/lang/fr/errors.php
        modified:   resources/lang/fr/settings.php
        modified:   resources/lang/he/editor.php
        modified:   resources/lang/he/entities.php
        modified:   resources/lang/he/settings.php
        modified:   resources/lang/hr/editor.php
        modified:   resources/lang/hr/entities.php
        modified:   resources/lang/hr/settings.php
        modified:   resources/lang/hu/editor.php
        modified:   resources/lang/hu/entities.php
        modified:   resources/lang/hu/settings.php
        modified:   resources/lang/id/editor.php
        modified:   resources/lang/id/entities.php
        modified:   resources/lang/id/settings.php
        modified:   resources/lang/it/editor.php
        modified:   resources/lang/it/entities.php
        modified:   resources/lang/it/settings.php
        modified:   resources/lang/ja/activities.php
        modified:   resources/lang/ja/auth.php
        modified:   resources/lang/ja/editor.php
        modified:   resources/lang/ja/entities.php
        modified:   resources/lang/ja/errors.php
        modified:   resources/lang/ja/settings.php
        modified:   resources/lang/ko/activities.php
        modified:   resources/lang/ko/editor.php
        modified:   resources/lang/ko/entities.php
        modified:   resources/lang/ko/settings.php
        modified:   resources/lang/lt/editor.php
        modified:   resources/lang/lt/entities.php
        modified:   resources/lang/lt/settings.php
        modified:   resources/lang/lv/editor.php
        modified:   resources/lang/lv/entities.php
        modified:   resources/lang/lv/settings.php
        modified:   resources/lang/nb/editor.php
        modified:   resources/lang/nb/entities.php
        modified:   resources/lang/nb/settings.php
        modified:   resources/lang/nl/editor.php
        modified:   resources/lang/nl/entities.php
        modified:   resources/lang/nl/settings.php
        modified:   resources/lang/pl/activities.php
        modified:   resources/lang/pl/editor.php
        modified:   resources/lang/pl/entities.php
        modified:   resources/lang/pl/errors.php
        modified:   resources/lang/pl/settings.php
        modified:   resources/lang/pt/activities.php
        modified:   resources/lang/pt/editor.php
        modified:   resources/lang/pt/entities.php
        modified:   resources/lang/pt/errors.php
        modified:   resources/lang/pt/settings.php
        modified:   resources/lang/pt_BR/activities.php
        modified:   resources/lang/pt_BR/auth.php
        modified:   resources/lang/pt_BR/editor.php
        modified:   resources/lang/pt_BR/entities.php
        modified:   resources/lang/pt_BR/errors.php
        modified:   resources/lang/pt_BR/settings.php
        modified:   resources/lang/ru/activities.php
        modified:   resources/lang/ru/editor.php
        modified:   resources/lang/ru/entities.php
        modified:   resources/lang/ru/errors.php
        modified:   resources/lang/ru/settings.php
        modified:   resources/lang/sk/editor.php
        modified:   resources/lang/sk/entities.php
        modified:   resources/lang/sk/settings.php
        modified:   resources/lang/sl/editor.php
        modified:   resources/lang/sl/entities.php
        modified:   resources/lang/sl/settings.php
        modified:   resources/lang/sv/activities.php
        modified:   resources/lang/sv/auth.php
        modified:   resources/lang/sv/common.php
        modified:   resources/lang/sv/editor.php
        modified:   resources/lang/sv/entities.php
        modified:   resources/lang/sv/errors.php
        modified:   resources/lang/sv/settings.php
        modified:   resources/lang/sv/validation.php
        modified:   resources/lang/tr/activities.php
        modified:   resources/lang/tr/editor.php
        modified:   resources/lang/tr/entities.php
        modified:   resources/lang/tr/settings.php
        modified:   resources/lang/uk/activities.php
        modified:   resources/lang/uk/editor.php
        modified:   resources/lang/uk/entities.php
        modified:   resources/lang/uk/errors.php
        modified:   resources/lang/uk/settings.php
        modified:   resources/lang/uz/editor.php
        modified:   resources/lang/uz/entities.php
        modified:   resources/lang/uz/settings.php
        modified:   resources/lang/vi/editor.php
        modified:   resources/lang/vi/entities.php
        modified:   resources/lang/vi/settings.php
        modified:   resources/lang/zh_CN/editor.php
        modified:   resources/lang/zh_CN/entities.php
        modified:   resources/lang/zh_CN/settings.php
        modified:   resources/lang/zh_TW/activities.php
        modified:   resources/lang/zh_TW/editor.php
        modified:   resources/lang/zh_TW/entities.php
        modified:   resources/lang/zh_TW/errors.php
        modified:   resources/lang/zh_TW/settings.php
        modified:   resources/sass/_buttons.scss
        modified:   resources/sass/_components.scss
        modified:   resources/sass/_forms.scss
        modified:   resources/sass/_layout.scss
        modified:   resources/sass/_pages.scss
        modified:   resources/sass/_spacing.scss
        modified:   resources/sass/styles.scss
        modified:   resources/views/api-docs/parts/getting-started.blade.php
        modified:   resources/views/books/permissions.blade.php
        modified:   resources/views/books/show.blade.php
        modified:   resources/views/chapters/permissions.blade.php
        modified:   resources/views/chapters/show.blade.php
        modified:   resources/views/form/custom-checkbox.blade.php
        modified:   resources/views/form/entity-permissions.blade.php
        deleted:    resources/views/form/restriction-checkbox.blade.php
        modified:   resources/views/pages/parts/code-editor.blade.php
        modified:   resources/views/pages/parts/pointer.blade.php
        modified:   resources/views/pages/parts/revision-table-row.blade.php
        modified:   resources/views/pages/permissions.blade.php
        modified:   resources/views/pages/show.blade.php
        modified:   resources/views/search/all.blade.php
        modified:   resources/views/settings/roles/parts/form.blade.php
        modified:   resources/views/shelves/permissions.blade.php
        modified:   resources/views/shelves/show.blade.php
        modified:   resources/views/users/index.blade.php
        modified:   routes/api.php
        modified:   routes/web.php
        modified:   tests/Actions/AuditLogTest.php
        modified:   tests/Actions/WebhookCallTest.php
        modified:   tests/Actions/WebhookFormatTesting.php
        modified:   tests/Api/AttachmentsApiTest.php
        modified:   tests/Api/BooksApiTest.php
        modified:   tests/Api/ChaptersApiTest.php
        modified:   tests/Api/PagesApiTest.php
        modified:   tests/Api/RecycleBinApiTest.php
        modified:   tests/Api/SearchApiTest.php
        modified:   tests/Api/UsersApiTest.php
        modified:   tests/Auth/AuthTest.php
        modified:   tests/Auth/Saml2Test.php
        modified:   tests/Auth/UserInviteTest.php
        modified:   tests/Commands/ClearActivityCommandTest.php
        modified:   tests/Commands/CopyShelfPermissionsCommandTest.php
        modified:   tests/Commands/RegenerateReferencesCommandTest.php
        modified:   tests/Commands/UpdateUrlCommandTest.php
        modified:   tests/Entity/BookShelfTest.php
        modified:   tests/Entity/BookTest.php
        modified:   tests/Entity/ChapterTest.php
        modified:   tests/Entity/CommentSettingTest.php
        modified:   tests/Entity/CommentTest.php
        modified:   tests/Entity/ConvertTest.php
        modified:   tests/Entity/EntityAccessTest.php
        modified:   tests/Entity/EntitySearchTest.php
        modified:   tests/Entity/ExportTest.php
        modified:   tests/Entity/PageContentTest.php
        modified:   tests/Entity/PageDraftTest.php
        modified:   tests/Entity/PageEditorTest.php
        modified:   tests/Entity/PageRevisionTest.php
        modified:   tests/Entity/PageTemplateTest.php
        modified:   tests/Entity/PageTest.php
        modified:   tests/Entity/SortTest.php
        modified:   tests/Entity/TagTest.php
        modified:   tests/ErrorTest.php
        modified:   tests/FavouriteTest.php
        modified:   tests/HomepageTest.php
        modified:   tests/OpenGraphTest.php
        modified:   tests/Permissions/EntityOwnerChangeTest.php
        modified:   tests/Permissions/EntityPermissionsTest.php
        modified:   tests/Permissions/ExportPermissionsTest.php
        modified:   tests/Permissions/RolesTest.php
        modified:   tests/PublicActionTest.php
        modified:   tests/Settings/RecycleBinTest.php
        modified:   tests/TestCase.php
        modified:   tests/ThemeTest.php
        modified:   tests/Uploads/AttachmentTest.php
        modified:   tests/Uploads/ImageTest.php
        modified:   tests/Uploads/UsesImages.php
        modified:   tests/UrlTest.php
        modified:   tests/User/UserManagementTest.php
        modified:   tests/User/UserPreferencesTest.php
        modified:   tests/User/UserProfileTest.php
        modified:   version

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        .env.bak
        .github/workflows/analyse-php.yml
        .github/workflows/lint-php.yml
        .github/workflows/test-php.yml
        app/Api/ApiEntityListFormatter.php
        app/Auth/Permissions/PermissionFormData.php
        app/Http/Controllers/Auth/ThrottlesLogins.php
        app/Http/Controllers/PermissionsController.php
        app/Providers/ValidationRuleServiceProvider.php
        app/Providers/ViewTweaksServiceProvider.php
        database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php
        database/migrations/2022_10_08_104202_drop_entity_restricted_field.php
        dev/docs/development.md
        dev/docs/javascript-code.md
        dev/docs/release-process.md
        owa/
        phpcs.xml
        resources/icons/groups.svg
        resources/icons/role.svg
        resources/js/components/entity-permissions.js
        resources/js/components/pointer.js
        resources/js/wysiwyg/icons.js
        resources/lang/el/
        resources/views/form/entity-permissions-row.blade.php
        tests/Auth/RegistrationTest.php
        tests/Auth/ResetPasswordTest.php
        tests/Helpers/EntityProvider.php
        tests/Helpers/TestServiceProvider.php

no changes added to commit (use "git add" and/or "git commit -a")

git log -n 1 shows:

XXXXXXXXXXXXXX@YYYYYYYYYYY:/var/www/bookstack$ git log -n 1
commit 2ac9efae7d1d5169f71fc9a2b76a1980e6703b0a (HEAD -> release)
Author: Dan Brown <ssddanbrown@googlemail.com>
Date:   Thu Sep 8 12:41:09 2022 +0100

    Updated version and assets for release v22.09
@helson22 commented on GitHub (Nov 18, 2022): Hi Dan, thanks for your fast reply :-) I do all you suggest on your documentation-pages. Installed with ubuntu script: https://www.bookstackapp.com/docs/admin/installation/#ubuntu-2204 Updating like this: https://www.bookstackapp.com/docs/admin/updates/ I do not anything from your second question. `git status` gives: <details> ``` XXXXXXXX@YYYYYYYYYY:/var/www/bookstack$ git status On branch release Your branch is behind 'origin/release' by 81 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: .github/translators.txt deleted: .github/workflows/phpstan.yml deleted: .github/workflows/phpunit.yml modified: .github/workflows/test-migrations.yml modified: LICENSE modified: app/Actions/TagRepo.php modified: app/Actions/Webhook.php modified: app/Actions/WebhookTrackedEvent.php modified: app/Api/ListingResponseBuilder.php modified: app/Auth/Access/LdapService.php modified: app/Auth/Access/LoginService.php modified: app/Auth/Access/Oidc/OidcService.php modified: app/Auth/Access/Saml2Service.php modified: app/Auth/Permissions/EntityPermission.php modified: app/Auth/Permissions/JointPermissionBuilder.php modified: app/Auth/Permissions/PermissionApplicator.php modified: app/Auth/Permissions/PermissionsRepo.php modified: app/Auth/Permissions/SimpleEntityData.php modified: app/Auth/Role.php modified: app/Auth/UserRepo.php modified: app/Config/app.php modified: app/Config/dompdf.php modified: app/Config/snappy.php modified: app/Console/Commands/CopyShelfPermissions.php modified: app/Entities/Models/Book.php modified: app/Entities/Models/Bookshelf.php modified: app/Entities/Models/Chapter.php modified: app/Entities/Models/Entity.php modified: app/Entities/Models/Page.php modified: app/Entities/Models/PageRevision.php modified: app/Entities/Repos/BookshelfRepo.php modified: app/Entities/Tools/BookContents.php modified: app/Entities/Tools/Cloner.php modified: app/Entities/Tools/HierarchyTransformer.php modified: app/Entities/Tools/PageEditActivity.php modified: app/Entities/Tools/PermissionsUpdater.php modified: app/Http/Controllers/Api/BookApiController.php modified: app/Http/Controllers/Api/BookshelfApiController.php modified: app/Http/Controllers/Api/SearchApiController.php modified: app/Http/Controllers/Auth/ConfirmEmailController.php modified: app/Http/Controllers/Auth/ForgotPasswordController.php modified: app/Http/Controllers/Auth/LoginController.php modified: app/Http/Controllers/Auth/RegisterController.php modified: app/Http/Controllers/Auth/ResetPasswordController.php modified: app/Http/Controllers/Auth/Saml2Controller.php modified: app/Http/Controllers/Auth/SocialController.php modified: app/Http/Controllers/Auth/UserInviteController.php modified: app/Http/Controllers/BookController.php modified: app/Http/Controllers/BookSortController.php modified: app/Http/Controllers/BookshelfController.php modified: app/Http/Controllers/ChapterController.php modified: app/Http/Controllers/FavouriteController.php modified: app/Http/Controllers/PageController.php modified: app/Http/Controllers/PageRevisionController.php modified: app/Http/Controllers/ReferenceController.php modified: app/Http/Controllers/TagController.php modified: app/Providers/AppServiceProvider.php modified: app/Providers/AuthServiceProvider.php deleted: app/Providers/BroadcastServiceProvider.php deleted: app/Providers/CustomFacadeProvider.php deleted: app/Providers/CustomValidationServiceProvider.php modified: app/Providers/EventServiceProvider.php deleted: app/Providers/PaginationServiceProvider.php modified: app/Providers/ThemeServiceProvider.php modified: app/Uploads/ImageService.php modified: app/Util/LanguageManager.php modified: composer.json modified: composer.lock modified: dev/api/responses/books-read.json deleted: dev/docs/components.md modified: public/dist/app.js modified: public/dist/code.js modified: public/dist/export-styles.css modified: public/dist/styles.css deleted: public/web.config modified: readme.md modified: resources/js/code.mjs modified: resources/js/components/auto-suggest.js deleted: resources/js/components/entity-permissions-editor.js modified: resources/js/components/index.js modified: resources/js/components/page-display.js modified: resources/js/components/permissions-table.js modified: resources/js/components/shelf-sort.js modified: resources/js/services/dom.js modified: resources/js/wysiwyg/config.js modified: resources/js/wysiwyg/plugin-codeeditor.js modified: resources/lang/ar/activities.php modified: resources/lang/ar/auth.php modified: resources/lang/ar/editor.php modified: resources/lang/ar/entities.php modified: resources/lang/ar/settings.php modified: resources/lang/bg/editor.php modified: resources/lang/bg/entities.php modified: resources/lang/bg/settings.php modified: resources/lang/bs/editor.php modified: resources/lang/bs/entities.php modified: resources/lang/bs/settings.php modified: resources/lang/ca/editor.php modified: resources/lang/ca/entities.php modified: resources/lang/ca/settings.php modified: resources/lang/cs/activities.php modified: resources/lang/cs/editor.php modified: resources/lang/cs/entities.php modified: resources/lang/cs/settings.php modified: resources/lang/cy/editor.php modified: resources/lang/cy/entities.php modified: resources/lang/cy/settings.php modified: resources/lang/da/editor.php modified: resources/lang/da/entities.php modified: resources/lang/da/settings.php modified: resources/lang/de/activities.php modified: resources/lang/de/auth.php modified: resources/lang/de/components.php modified: resources/lang/de/editor.php modified: resources/lang/de/entities.php modified: resources/lang/de/errors.php modified: resources/lang/de/settings.php modified: resources/lang/de/validation.php modified: resources/lang/de_informal/activities.php modified: resources/lang/de_informal/auth.php modified: resources/lang/de_informal/common.php modified: resources/lang/de_informal/editor.php modified: resources/lang/de_informal/entities.php modified: resources/lang/de_informal/errors.php modified: resources/lang/de_informal/settings.php modified: resources/lang/en/editor.php modified: resources/lang/en/entities.php modified: resources/lang/en/settings.php modified: resources/lang/es/editor.php modified: resources/lang/es/entities.php modified: resources/lang/es/settings.php modified: resources/lang/es_AR/activities.php modified: resources/lang/es_AR/editor.php modified: resources/lang/es_AR/entities.php modified: resources/lang/es_AR/settings.php modified: resources/lang/et/activities.php modified: resources/lang/et/editor.php modified: resources/lang/et/entities.php modified: resources/lang/et/errors.php modified: resources/lang/et/settings.php modified: resources/lang/eu/editor.php modified: resources/lang/eu/entities.php modified: resources/lang/eu/settings.php modified: resources/lang/fa/activities.php modified: resources/lang/fa/auth.php modified: resources/lang/fa/editor.php modified: resources/lang/fa/entities.php modified: resources/lang/fa/errors.php modified: resources/lang/fa/settings.php modified: resources/lang/fr/activities.php modified: resources/lang/fr/editor.php modified: resources/lang/fr/entities.php modified: resources/lang/fr/errors.php modified: resources/lang/fr/settings.php modified: resources/lang/he/editor.php modified: resources/lang/he/entities.php modified: resources/lang/he/settings.php modified: resources/lang/hr/editor.php modified: resources/lang/hr/entities.php modified: resources/lang/hr/settings.php modified: resources/lang/hu/editor.php modified: resources/lang/hu/entities.php modified: resources/lang/hu/settings.php modified: resources/lang/id/editor.php modified: resources/lang/id/entities.php modified: resources/lang/id/settings.php modified: resources/lang/it/editor.php modified: resources/lang/it/entities.php modified: resources/lang/it/settings.php modified: resources/lang/ja/activities.php modified: resources/lang/ja/auth.php modified: resources/lang/ja/editor.php modified: resources/lang/ja/entities.php modified: resources/lang/ja/errors.php modified: resources/lang/ja/settings.php modified: resources/lang/ko/activities.php modified: resources/lang/ko/editor.php modified: resources/lang/ko/entities.php modified: resources/lang/ko/settings.php modified: resources/lang/lt/editor.php modified: resources/lang/lt/entities.php modified: resources/lang/lt/settings.php modified: resources/lang/lv/editor.php modified: resources/lang/lv/entities.php modified: resources/lang/lv/settings.php modified: resources/lang/nb/editor.php modified: resources/lang/nb/entities.php modified: resources/lang/nb/settings.php modified: resources/lang/nl/editor.php modified: resources/lang/nl/entities.php modified: resources/lang/nl/settings.php modified: resources/lang/pl/activities.php modified: resources/lang/pl/editor.php modified: resources/lang/pl/entities.php modified: resources/lang/pl/errors.php modified: resources/lang/pl/settings.php modified: resources/lang/pt/activities.php modified: resources/lang/pt/editor.php modified: resources/lang/pt/entities.php modified: resources/lang/pt/errors.php modified: resources/lang/pt/settings.php modified: resources/lang/pt_BR/activities.php modified: resources/lang/pt_BR/auth.php modified: resources/lang/pt_BR/editor.php modified: resources/lang/pt_BR/entities.php modified: resources/lang/pt_BR/errors.php modified: resources/lang/pt_BR/settings.php modified: resources/lang/ru/activities.php modified: resources/lang/ru/editor.php modified: resources/lang/ru/entities.php modified: resources/lang/ru/errors.php modified: resources/lang/ru/settings.php modified: resources/lang/sk/editor.php modified: resources/lang/sk/entities.php modified: resources/lang/sk/settings.php modified: resources/lang/sl/editor.php modified: resources/lang/sl/entities.php modified: resources/lang/sl/settings.php modified: resources/lang/sv/activities.php modified: resources/lang/sv/auth.php modified: resources/lang/sv/common.php modified: resources/lang/sv/editor.php modified: resources/lang/sv/entities.php modified: resources/lang/sv/errors.php modified: resources/lang/sv/settings.php modified: resources/lang/sv/validation.php modified: resources/lang/tr/activities.php modified: resources/lang/tr/editor.php modified: resources/lang/tr/entities.php modified: resources/lang/tr/settings.php modified: resources/lang/uk/activities.php modified: resources/lang/uk/editor.php modified: resources/lang/uk/entities.php modified: resources/lang/uk/errors.php modified: resources/lang/uk/settings.php modified: resources/lang/uz/editor.php modified: resources/lang/uz/entities.php modified: resources/lang/uz/settings.php modified: resources/lang/vi/editor.php modified: resources/lang/vi/entities.php modified: resources/lang/vi/settings.php modified: resources/lang/zh_CN/editor.php modified: resources/lang/zh_CN/entities.php modified: resources/lang/zh_CN/settings.php modified: resources/lang/zh_TW/activities.php modified: resources/lang/zh_TW/editor.php modified: resources/lang/zh_TW/entities.php modified: resources/lang/zh_TW/errors.php modified: resources/lang/zh_TW/settings.php modified: resources/sass/_buttons.scss modified: resources/sass/_components.scss modified: resources/sass/_forms.scss modified: resources/sass/_layout.scss modified: resources/sass/_pages.scss modified: resources/sass/_spacing.scss modified: resources/sass/styles.scss modified: resources/views/api-docs/parts/getting-started.blade.php modified: resources/views/books/permissions.blade.php modified: resources/views/books/show.blade.php modified: resources/views/chapters/permissions.blade.php modified: resources/views/chapters/show.blade.php modified: resources/views/form/custom-checkbox.blade.php modified: resources/views/form/entity-permissions.blade.php deleted: resources/views/form/restriction-checkbox.blade.php modified: resources/views/pages/parts/code-editor.blade.php modified: resources/views/pages/parts/pointer.blade.php modified: resources/views/pages/parts/revision-table-row.blade.php modified: resources/views/pages/permissions.blade.php modified: resources/views/pages/show.blade.php modified: resources/views/search/all.blade.php modified: resources/views/settings/roles/parts/form.blade.php modified: resources/views/shelves/permissions.blade.php modified: resources/views/shelves/show.blade.php modified: resources/views/users/index.blade.php modified: routes/api.php modified: routes/web.php modified: tests/Actions/AuditLogTest.php modified: tests/Actions/WebhookCallTest.php modified: tests/Actions/WebhookFormatTesting.php modified: tests/Api/AttachmentsApiTest.php modified: tests/Api/BooksApiTest.php modified: tests/Api/ChaptersApiTest.php modified: tests/Api/PagesApiTest.php modified: tests/Api/RecycleBinApiTest.php modified: tests/Api/SearchApiTest.php modified: tests/Api/UsersApiTest.php modified: tests/Auth/AuthTest.php modified: tests/Auth/Saml2Test.php modified: tests/Auth/UserInviteTest.php modified: tests/Commands/ClearActivityCommandTest.php modified: tests/Commands/CopyShelfPermissionsCommandTest.php modified: tests/Commands/RegenerateReferencesCommandTest.php modified: tests/Commands/UpdateUrlCommandTest.php modified: tests/Entity/BookShelfTest.php modified: tests/Entity/BookTest.php modified: tests/Entity/ChapterTest.php modified: tests/Entity/CommentSettingTest.php modified: tests/Entity/CommentTest.php modified: tests/Entity/ConvertTest.php modified: tests/Entity/EntityAccessTest.php modified: tests/Entity/EntitySearchTest.php modified: tests/Entity/ExportTest.php modified: tests/Entity/PageContentTest.php modified: tests/Entity/PageDraftTest.php modified: tests/Entity/PageEditorTest.php modified: tests/Entity/PageRevisionTest.php modified: tests/Entity/PageTemplateTest.php modified: tests/Entity/PageTest.php modified: tests/Entity/SortTest.php modified: tests/Entity/TagTest.php modified: tests/ErrorTest.php modified: tests/FavouriteTest.php modified: tests/HomepageTest.php modified: tests/OpenGraphTest.php modified: tests/Permissions/EntityOwnerChangeTest.php modified: tests/Permissions/EntityPermissionsTest.php modified: tests/Permissions/ExportPermissionsTest.php modified: tests/Permissions/RolesTest.php modified: tests/PublicActionTest.php modified: tests/Settings/RecycleBinTest.php modified: tests/TestCase.php modified: tests/ThemeTest.php modified: tests/Uploads/AttachmentTest.php modified: tests/Uploads/ImageTest.php modified: tests/Uploads/UsesImages.php modified: tests/UrlTest.php modified: tests/User/UserManagementTest.php modified: tests/User/UserPreferencesTest.php modified: tests/User/UserProfileTest.php modified: version Untracked files: (use "git add <file>..." to include in what will be committed) .env.bak .github/workflows/analyse-php.yml .github/workflows/lint-php.yml .github/workflows/test-php.yml app/Api/ApiEntityListFormatter.php app/Auth/Permissions/PermissionFormData.php app/Http/Controllers/Auth/ThrottlesLogins.php app/Http/Controllers/PermissionsController.php app/Providers/ValidationRuleServiceProvider.php app/Providers/ViewTweaksServiceProvider.php database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php database/migrations/2022_10_08_104202_drop_entity_restricted_field.php dev/docs/development.md dev/docs/javascript-code.md dev/docs/release-process.md owa/ phpcs.xml resources/icons/groups.svg resources/icons/role.svg resources/js/components/entity-permissions.js resources/js/components/pointer.js resources/js/wysiwyg/icons.js resources/lang/el/ resources/views/form/entity-permissions-row.blade.php tests/Auth/RegistrationTest.php tests/Auth/ResetPasswordTest.php tests/Helpers/EntityProvider.php tests/Helpers/TestServiceProvider.php no changes added to commit (use "git add" and/or "git commit -a") ```` </details> `git log -n 1` shows: ``` XXXXXXXXXXXXXX@YYYYYYYYYYY:/var/www/bookstack$ git log -n 1 commit 2ac9efae7d1d5169f71fc9a2b76a1980e6703b0a (HEAD -> release) Author: Dan Brown <ssddanbrown@googlemail.com> Date: Thu Sep 8 12:41:09 2022 +0100 Updated version and assets for release v22.09 ```
OVERLORD commented 2026-02-05 06:27:10 +03:00
Author
Owner
Copy Link

@ssddanbrown commented on GitHub (Nov 18, 2022):

Okay, looks like it's on the original line of code, just in a very messy state for some reason. Maybe like someone has tried to upate via manually copying/uploading files. I see a custom owa/ folder in there but that should not interfere too much.

Before the below, please backup everything, so the whole machine or the database and files. Just in the event things go wrong and you lose content. Once done try running git reset --hard. After running that you should have a much cleaner git status output since most of the code files should be reset to their expected state. Then re-run through the update commands one-at-a-time, noting the original output at each point to share if things still don't work after. Just need to hope development files have not been used at any point here.

@ssddanbrown commented on GitHub (Nov 18, 2022): Okay, looks like it's on the original line of code, just in a very messy state for some reason. Maybe like someone has tried to upate via manually copying/uploading files. I see a custom `owa/` folder in there but that should not interfere too much. Before the below, please backup everything, so the whole machine or the database and files. Just in the event things go wrong and you lose content. Once done try running `git reset --hard`. After running that you should have a much cleaner `git status` output since most of the code files should be reset to their expected state. Then re-run through the update commands one-at-a-time, noting the original output at each point to share if things still don't work after. Just need to hope development files have not been used at any point here.
OVERLORD commented 2026-02-05 06:27:14 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Nov 22, 2022):

Ok, I'sure that nobody copied files manually but obviously there is something wrong... The owa is a open web analytics folder. I deleted it because it's not in use - because I have no clue how to make it run within Bookstack folder and without subdomain...

Do you think all might be OK when updating to the next version or is this probably not true?

@helson22 commented on GitHub (Nov 22, 2022): Ok, I'sure that nobody copied files manually but obviously there is something wrong... The owa is a open web analytics folder. I deleted it because it's not in use - because I have no clue how to make it run within Bookstack folder and without subdomain... Do you think all might be OK when updating to the next version or is this probably not true?
OVERLORD commented 2026-02-05 06:27:18 +03:00
Author
Owner
Copy Link

@ssddanbrown commented on GitHub (Nov 22, 2022):

If you've done the above, and have reset files to their expected sate, then you should be fine in the future since your code is now as expected, but hard to say for sure without knowing what caused this set of changes originally.

@ssddanbrown commented on GitHub (Nov 22, 2022): If you've done the above, and have reset files to their expected sate, then you should be fine in the future since your code is now as expected, but hard to say for sure without knowing what caused this set of changes originally.
OVERLORD commented 2026-02-05 06:27:21 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 7, 2022):

Ok,

git reset --hard gives

HEAD is now at 2ac9efae Updated version and assets for release v22.09

then git status says:

On branch release
Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)

Untracked files:
(use "git add ..." to include in what will be committed)
.env.bak
.github/workflows/analyse-php.yml
.github/workflows/lint-php.yml
.github/workflows/test-php.yml
app/Api/ApiEntityListFormatter.php
app/Auth/Permissions/PermissionFormData.php
app/Http/Controllers/Auth/ThrottlesLogins.php
app/Http/Controllers/PermissionsController.php
app/Providers/ValidationRuleServiceProvider.php
app/Providers/ViewTweaksServiceProvider.php
database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php
database/migrations/2022_10_08_104202_drop_entity_restricted_field.php
dev/docs/development.md
dev/docs/javascript-code.md
dev/docs/release-process.md
phpcs.xml
resources/icons/groups.svg
resources/icons/role.svg
resources/js/components/entity-permissions.js
resources/js/components/pointer.js
resources/js/wysiwyg/icons.js
resources/lang/el/
resources/views/form/entity-permissions-row.blade.php
tests/Auth/RegistrationTest.php
tests/Auth/ResetPasswordTest.php
tests/Helpers/EntityProvider.php
tests/Helpers/TestServiceProvider.php

Do you think I can safely update to latest version now?

@helson22 commented on GitHub (Dec 7, 2022): Ok, `git reset --hard gives` HEAD is now at 2ac9efae Updated version and assets for release v22.09 then `git status` says: On branch release Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Untracked files: (use "git add <file>..." to include in what will be committed) .env.bak .github/workflows/analyse-php.yml .github/workflows/lint-php.yml .github/workflows/test-php.yml app/Api/ApiEntityListFormatter.php app/Auth/Permissions/PermissionFormData.php app/Http/Controllers/Auth/ThrottlesLogins.php app/Http/Controllers/PermissionsController.php app/Providers/ValidationRuleServiceProvider.php app/Providers/ViewTweaksServiceProvider.php database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php database/migrations/2022_10_08_104202_drop_entity_restricted_field.php dev/docs/development.md dev/docs/javascript-code.md dev/docs/release-process.md phpcs.xml resources/icons/groups.svg resources/icons/role.svg resources/js/components/entity-permissions.js resources/js/components/pointer.js resources/js/wysiwyg/icons.js resources/lang/el/ resources/views/form/entity-permissions-row.blade.php tests/Auth/RegistrationTest.php tests/Auth/ResetPasswordTest.php tests/Helpers/EntityProvider.php tests/Helpers/TestServiceProvider.php Do you think I can safely update to latest version now?
OVERLORD commented 2026-02-05 06:27:23 +03:00
Author
Owner
Copy Link

@ssddanbrown commented on GitHub (Dec 7, 2022):

Do you think I can safely update to latest version now?

You still have a lot of extra files that are part of future updates, might cause problems.
You could remove these via running git clean -f but BACKUP ALL FILES FIRST since this command does delete files.
After running that, git status should show no untracked files like it does now. Then upgrading should be safe. Again though, hard to say for sure without knowing what caused this set of changes originally

@ssddanbrown commented on GitHub (Dec 7, 2022): > Do you think I can safely update to latest version now? You still have a lot of extra files that are part of future updates, might cause problems. You could remove these via running `git clean -f` but **BACKUP ALL FILES FIRST** since this command does delete files. After running that, `git status` should show no untracked files like it does now. Then upgrading should be safe. Again though, hard to say for sure without knowing what caused this set of changes originally
OVERLORD commented 2026-02-05 06:27:27 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 7, 2022):

Hi,

thanx for responding so fast :-)

I've done git clean -f with folowing output

Removing .env.bak
Removing .github/workflows/analyse-php.yml
Removing .github/workflows/lint-php.yml
Removing .github/workflows/test-php.yml
Removing app/Api/ApiEntityListFormatter.php
Removing app/Auth/Permissions/PermissionFormData.php
Removing app/Http/Controllers/Auth/ThrottlesLogins.php
Removing app/Http/Controllers/PermissionsController.php
Removing app/Providers/ValidationRuleServiceProvider.php
Removing app/Providers/ViewTweaksServiceProvider.php
Removing database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php
Removing database/migrations/2022_10_08_104202_drop_entity_restricted_field.php
Removing dev/docs/development.md
Removing dev/docs/javascript-code.md
Removing dev/docs/release-process.md
Removing phpcs.xml
Removing resources/icons/groups.svg
Removing resources/icons/role.svg
Removing resources/js/components/entity-permissions.js
Removing resources/js/components/pointer.js
Removing resources/js/wysiwyg/icons.js
Removing resources/views/form/entity-permissions-row.blade.php
Removing tests/Auth/RegistrationTest.php
Removing tests/Auth/ResetPasswordTest.php
Removing tests/Helpers/EntityProvider.php
Removing tests/Helpers/TestServiceProvider.php

Then git status meant:

On branch release
Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)

Untracked files:
(use "git add ..." to include in what will be committed)
resources/lang/el/

nothing added to commit but untracked files present (use "git add" to track)

@helson22 commented on GitHub (Dec 7, 2022): Hi, thanx for responding so fast :-) I've done `git clean -f` with folowing output Removing .env.bak Removing .github/workflows/analyse-php.yml Removing .github/workflows/lint-php.yml Removing .github/workflows/test-php.yml Removing app/Api/ApiEntityListFormatter.php Removing app/Auth/Permissions/PermissionFormData.php Removing app/Http/Controllers/Auth/ThrottlesLogins.php Removing app/Http/Controllers/PermissionsController.php Removing app/Providers/ValidationRuleServiceProvider.php Removing app/Providers/ViewTweaksServiceProvider.php Removing database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php Removing database/migrations/2022_10_08_104202_drop_entity_restricted_field.php Removing dev/docs/development.md Removing dev/docs/javascript-code.md Removing dev/docs/release-process.md Removing phpcs.xml Removing resources/icons/groups.svg Removing resources/icons/role.svg Removing resources/js/components/entity-permissions.js Removing resources/js/components/pointer.js Removing resources/js/wysiwyg/icons.js Removing resources/views/form/entity-permissions-row.blade.php Removing tests/Auth/RegistrationTest.php Removing tests/Auth/ResetPasswordTest.php Removing tests/Helpers/EntityProvider.php Removing tests/Helpers/TestServiceProvider.php Then `git status` meant: On branch release Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Untracked files: (use "git add <file>..." to include in what will be committed) resources/lang/el/ nothing added to commit but untracked files present (use "git add" to track)
OVERLORD commented 2026-02-05 06:27:30 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 7, 2022):

Now I get a white page when I want to access bookstack

@helson22 commented on GitHub (Dec 7, 2022): Now I get a white page when I want to access bookstack
OVERLORD commented 2026-02-05 06:27:34 +03:00
Author
Owner
Copy Link

@ssddanbrown commented on GitHub (Dec 7, 2022):

Go through the update process, one command at a time, recording output and sharing any errors that occur.

@ssddanbrown commented on GitHub (Dec 7, 2022): Go through the update process, one command at a time, recording output and sharing any errors that occur.
OVERLORD commented 2026-02-05 06:27:36 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 7, 2022):

Error at first command

git pull origin release

From https://github.com/BookStackApp/BookStack

  • branch release -> FETCH_HEAD
    Updating 2ac9efae..bf6a6af6
    error: The following untracked working tree files would be overwritten by merge:
    resources/lang/el/activities.php
    resources/lang/el/auth.php
    resources/lang/el/common.php
    resources/lang/el/components.php
    resources/lang/el/editor.php
    resources/lang/el/entities.php
    resources/lang/el/errors.php
    resources/lang/el/pagination.php
    resources/lang/el/passwords.php
    resources/lang/el/settings.php
    resources/lang/el/validation.php
    Please move or remove them before you merge.
    Aborting

Stopped procedure now due to abort. Any Ideas? :-)

git status is the same output as previous post

@helson22 commented on GitHub (Dec 7, 2022): Error at first command `git pull origin release` From https://github.com/BookStackApp/BookStack * branch release -> FETCH_HEAD Updating 2ac9efae..bf6a6af6 **error: The following untracked working tree files would be overwritten by merge:** resources/lang/el/activities.php resources/lang/el/auth.php resources/lang/el/common.php resources/lang/el/components.php resources/lang/el/editor.php resources/lang/el/entities.php resources/lang/el/errors.php resources/lang/el/pagination.php resources/lang/el/passwords.php resources/lang/el/settings.php resources/lang/el/validation.php Please move or remove them before you merge. **Aborting** Stopped procedure now due to abort. Any Ideas? :-) `git status` is the same output as previous post
OVERLORD commented 2026-02-05 06:27:39 +03:00
Author
Owner
Copy Link

@ssddanbrown commented on GitHub (Dec 7, 2022):

Delete the resources/lang/el/ directory and try again.

@ssddanbrown commented on GitHub (Dec 7, 2022): Delete the `resources/lang/el/` directory and try again.
OVERLORD commented 2026-02-05 06:27:42 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 7, 2022):

Ok, question who should own all the files an directories? www-data? Can different permissions cause such mess?

From https://github.com/BookStackApp/BookStack

  • branch release -> FETCH_HEAD
    Updating 2ac9efae..bf6a6af6
    error: Your local changes to the following files would be overwritten by merge:
    .github/translators.txt
    .github/workflows/test-migrations.yml
    LICENSE
    app/Actions/TagRepo.php
    app/Actions/Webhook.php
    app/Actions/WebhookTrackedEvent.php
    app/Api/ListingResponseBuilder.php
    app/Auth/Access/LdapService.php
    app/Auth/Access/LoginService.php
    app/Auth/Access/Oidc/OidcJwtSigningKey.php
    app/Auth/Access/Oidc/OidcProviderSettings.php
    app/Auth/Access/Oidc/OidcService.php
    app/Auth/Access/Saml2Service.php
    app/Auth/Permissions/EntityPermission.php
    app/Auth/Permissions/JointPermissionBuilder.php
    app/Auth/Permissions/PermissionApplicator.php
    app/Auth/Permissions/PermissionsRepo.php
    app/Auth/Permissions/SimpleEntityData.php
    app/Auth/Role.php
    app/Auth/UserRepo.php
    app/Config/app.php
    app/Config/dompdf.php
    app/Config/setting-defaults.php
    app/Config/snappy.php
    app/Console/Commands/CopyShelfPermissions.php
    app/Entities/Models/Book.php
    app/Entities/Models/Bookshelf.php
    app/Entities/Models/Chapter.php
    app/Entities/Models/Entity.php
    app/Entities/Models/Page.php
    app/Entities/Models/PageRevision.php
    app/Entities/Repos/BaseRepo.php
    app/Entities/Repos/BookshelfRepo.php
    app/Entities/Tools/BookContents.php
    app/Entities/Tools/Cloner.php
    app/Entities/Tools/HierarchyTransformer.php
    app/Entities/Tools/PageEditActivity.php
    app/Entities/Tools/PermissionsUpdater.php
    app/Http/Controllers/Api/BookApiController.php
    app/Http/Controllers/Api/BookshelfApiController.php
    app/Http/Controllers/Api/SearchApiController.php
    app/Http/Controllers/AuditLogController.php
    app/Http/Controllers/Auth/ConfirmEmailController.php
    app/Http/Controllers/Auth/ForgotPasswordController.php
    app/Http/Controllers/Auth/LoginController.php
    app/Http/Controllers/Auth/RegisterController.php
    app/Http/Controllers/Auth/ResetPasswordController.php
    app/Http/Controllers/Auth/Saml2Controller.php
    app/Http/Controllers/Auth/SocialController.php
    app/Http/Controllers/Auth/UserInviteController.php
    app/Http/Controllers/BookController.php
    app/Http/Controllers/BookSortController.php
    app/Http/Controllers/BookshelfController.php
    app/Http/Controllers/ChapterController.php
    app/Http/Controllers/FavouriteController.php
    app/Http/Controllers/HomeController.php
    app/Http/Controllers/PageController.php
    app/Http/Controllers/PageRevisionController.php
    app/Http/Controllers/ReferenceController.php
    app/Http/Controllers/RoleController.php
    app/Http/Controllers/SearchController.php
    app/Http/Controllers/TagController.php
    app/Http/Controllers/UserController.php
    app/Http/Controllers/WebhookController.php
    app/Providers/AppServiceProvider.php
    app/Providers/AuthServiceProvider.php
    app/Providers/EventServiceProvider.php
    app/Providers/RouteServiceProvider.php
    app/Providers/ThemeServiceProvider.php
    app/Settings/SettingService.php
    app/Uploads/ImageService.php
    app/Util/LanguageManager.php
    composer.json
    composer.lock
    dev/api/responses/books-read.json
    package-lock.json
    package.json
    public/dist/app.js
    public/dist/code.js
    public/dist/export-styles.css
    public/dist/print-styles.css
    public/dist/styles.css
    readme.md
    resources/icons/image.svg
    resources/js/app.js
    resources/js/code.mjs
    resources/js/components/add-remove-rows.js
    resources/js/components/ajax-delete-row.js
    resources/js/components/ajax-form.js
    resources/js/components/attachments-list.js
    resources/js/components/attachments.js
    resources/js/components/auto-suggest.js
    resources/js/components/back-to-top.js
    resources/js/components/book-sort.js
    resources/js/components/chapter-contents.js
    resources/js/components/code-editor.js
    resources/js/components/code-highlighter.js
    resources/js/components/code-textarea.js
    resources/js/components/collapsible.js
    resources/js/components/confirm-dialog.js
    resources/js/components/custom-checkbox.js
    resources/js/components/details-highlighter.js
    resources/js/components/dropdown-search.js
    resources/js/components/dropdown.js
    resources/js/components/dropzone.js
    resources/js/components/editor-toolbox.js
    resources/js/components/entity-search.js
    resources/js/componen
    error: The following untracked working tree files would be overwritten by merge:
    .github/workflows/analyse-php.yml
    .github/workflows/lint-php.yml
    .github/workflows/test-php.yml
    app/Actions/Queries/WebhooksAllPaginatedAndSorted.php
    app/Api/ApiEntityListFormatter.php
    app/Auth/Permissions/PermissionFormData.php
    app/Auth/Queries/RolesAllPaginatedAndSorted.php
    app/Auth/Queries/UsersAllPaginatedAndSorted.php
    app/Http/Controllers/Auth/ThrottlesLogins.php
    app/Http/Controllers/PermissionsController.php
    app/Http/Controllers/UserPreferencesController.php
    app/Providers/ValidationRuleServiceProvider.php
    app/Providers/ViewTweaksServiceProvider.php
    app/Settings/UserShortcutMap.php
    app/Util/SimpleListOptions.php
    database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php
    database/migrations/2022_10_08_104202_drop_entity_restricted_field.php
    dev/docs/development.md
    dev/docs/javascript-code.md
    dev/docs/release-process.md
    phpcs.xml
    resources/icons/groups.svg
    resources/icons/role.svg
    resources/icons/shortcuts.svg
    resources/js/components/auto-submit.js
    resources/js/components/component.js
    resources/js/components/entity-permissions.js
    resources/js/components/global-search.js
    resources/js/components/pointer.js
    resources/js/components/setting-homepage-control.js
    resources/js/components/shortcut-input.js
    resources/js/components/shortcuts.js
    resources/js/markdown/actions.js
    resources/js/markdown/codemirror.js
    resources/js/markdown/common-events.js
    resources/js/markdown/display.js
    resources/js/markdown/editor.js
    resources/js/markdown/markdown.js
    resources/js/markdown/settings.js
    resources/js/markdown/shortcuts.js
    resources/js/services/components.js
    resources/js/services/keyboard-navigation.js
    resources/js/services/text.js
    resources/js/wysiwyg/icons.js
    resources/lang/ar/preferences.php
    resources/lang/bg/preferences.php
    resources/lang/bs/preferences.php
    resources/lang/ca/preferences.php
    resources/lang/cs/preferences.php
    resources/lang/cy/preferences.php
    resources/lang/da/preferences.php
    resources/lang/de/preferences.php
    resources/lang/de_informal/preferences.php
    resources/lang/el/activities.php
    resources/lang/el/auth.php
    resources/lang/el/common.php
    resources/lang/el/components.php
    resources/lang/el/editor.php
    resources/lang/el/entities.php
    resources/lang/el/errors.php
    resources/lang/el/pagination.php
    resources/lang/el/passwords.php
    resources/lang/el/preferences.php
    resources/lang/el/settings.php
    resources/lang/el/validation.php
    resources/lang/en/preferences.php
    resources/lang/es/preferences.php
    resources/lang/es_AR/preferences.php
    resources/lang/et/preferences.php
    resources/lang/eu/preferences.php
    resources/lang/fa/preferences.php
    resources/lang/fr/preferences.php
    resources/lang/he/preferences.php
    resources/lang/hr/preferences.php
    resources/lang/hu/preferences.php
    resources/lang/id/preferences.php
    resources/lang/it/preferences.php
    resources/lang/ja/preferences.php
    resources/lang/ka/activities.php
    resources/lang/ka/auth.php
    resources/lang/ka/common.php
    resources/lang/ka/components.php
    resources/lang/ka/editor.php
    resources/lang/ka/entities.php
    resources/lang/ka/errors.php
    resources/lang/ka/pagination.php
    resources/lang/ka/passwords.php
    resources/lang/ka/preferences.php
    resources/lang/ka/settings.php
    resources/lang/ka/validation.php
    resources/lang/ko/preferences.php
    resources/lang/lt/preferences.php
    resources/lang/lv/preferences.php
    resources/lang/nb/preferences.php
    resources/lang/nl/preferences.php
    resources/lang/pl/preferences.php
    resources/lang/pt/preferences.php
    resources/lang/pt_BR/preferences.php
    resources/lang/ru/preferences.php
    resources/lang/sk/preferences.php
    resources/lang/sl/preferences.php
    resources/lang/sv/preferences.php
    resources/lang/tr/preferences.php
    resources/lang/uk/preferences.php
    resources/lang/uz/preferences.php
    resources/lang/vi/preferences.php
    resources/lang/zh_CN/preferences.php
    resources/lang/zh_TW/preferences.php
    resources/sass/_opacity.scss
    resources/views/auth/parts/login-message.blade.php
    resou
    Aborting

git status

On branch release
Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)

Changes not staged for commit:
(use "git add/rm ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: .github/translators.txt
deleted: .github/workflows/phpstan.yml
deleted: .github/workflows/phpunit.yml
modified: .github/workflows/test-migrations.yml
modified: LICENSE
modified: app/Actions/TagRepo.php
modified: app/Actions/Webhook.php
modified: app/Actions/WebhookTrackedEvent.php
modified: app/Api/ListingResponseBuilder.php
modified: app/Auth/Access/LdapService.php
modified: app/Auth/Access/LoginService.php
modified: app/Auth/Access/Oidc/OidcJwtSigningKey.php
modified: app/Auth/Access/Oidc/OidcProviderSettings.php
modified: app/Auth/Access/Oidc/OidcService.php
modified: app/Auth/Access/Saml2Service.php
modified: app/Auth/Permissions/EntityPermission.php
modified: app/Auth/Permissions/JointPermissionBuilder.php
modified: app/Auth/Permissions/PermissionApplicator.php
modified: app/Auth/Permissions/PermissionsRepo.php
modified: app/Auth/Permissions/SimpleEntityData.php
deleted: app/Auth/Queries/AllUsersPaginatedAndSorted.php
modified: app/Auth/Role.php
modified: app/Auth/UserRepo.php
modified: app/Config/app.php
modified: app/Config/dompdf.php
modified: app/Config/setting-defaults.php
modified: app/Config/snappy.php
modified: app/Console/Commands/CopyShelfPermissions.php
modified: app/Entities/Models/Book.php
modified: app/Entities/Models/Bookshelf.php
modified: app/Entities/Models/Chapter.php
modified: app/Entities/Models/Entity.php
modified: app/Entities/Models/Page.php
modified: app/Entities/Models/PageRevision.php
modified: app/Entities/Repos/BaseRepo.php
modified: app/Entities/Repos/BookshelfRepo.php
modified: app/Entities/Tools/BookContents.php
modified: app/Entities/Tools/Cloner.php
modified: app/Entities/Tools/HierarchyTransformer.php
modified: app/Entities/Tools/PageEditActivity.php
modified: app/Entities/Tools/PermissionsUpdater.php
modified: app/Http/Controllers/Api/BookApiController.php
modified: app/Http/Controllers/Api/BookshelfApiController.php
modified: app/Http/Controllers/Api/SearchApiController.php
modified: app/Http/Controllers/AuditLogController.php
modified: app/Http/Controllers/Auth/ConfirmEmailController.php
modified: app/Http/Controllers/Auth/ForgotPasswordController.php
modified: app/Http/Controllers/Auth/LoginController.php
modified: app/Http/Controllers/Auth/RegisterController.php
modified: app/Http/Controllers/Auth/ResetPasswordController.php
modified: app/Http/Controllers/Auth/Saml2Controller.php
modified: app/Http/Controllers/Auth/SocialController.php
modified: app/Http/Controllers/Auth/UserInviteController.php
modified: app/Http/Controllers/BookController.php
modified: app/Http/Controllers/BookSortController.php
modified: app/Http/Controllers/BookshelfController.php
modified: app/Http/Controllers/ChapterController.php
modified: app/Http/Controllers/FavouriteController.php
modified: app/Http/Controllers/HomeController.php
modified: app/Http/Controllers/PageController.php
modified: app/Http/Controllers/PageRevisionController.php
modified: app/Http/Controllers/ReferenceController.php
modified: app/Http/Controllers/RoleController.php
modified: app/Http/Controllers/SearchController.php
modified: app/Http/Controllers/TagController.php
modified: app/Http/Controllers/UserController.php
modified: app/Http/Controllers/WebhookController.php
modified: app/Providers/AppServiceProvider.php
modified: app/Providers/AuthServiceProvider.php
deleted: app/Providers/BroadcastServiceProvider.php
deleted: app/Providers/CustomFacadeProvider.php
deleted: app/Providers/CustomValidationServiceProvider.php
modified: app/Providers/EventServiceProvider.php
deleted: app/Providers/PaginationServiceProvider.php
modified: app/Providers/RouteServiceProvider.php
modified: app/Providers/ThemeServiceProvider.php
modified: app/Settings/SettingService.php
modified: app/Uploads/ImageService.php
modified: app/Util/LanguageManager.php
modified: composer.json
modified: composer.lock
modified: dev/api/responses/books-read.json
deleted: dev/docs/components.md
modified: package-lock.json
modified: package.json
modified: public/dist/app.js
modified: public/dist/code.js
modified: public/dist/export-styles.css
modified: public/dist/print-styles.css
modified: public/dist/styles.css
modified: readme.md
modified: resources/icons/image.svg
modified: resources/js/app.js
modified: resources/js/code.mjs
modified: resources/js/components/add-remove-rows.js
modified: resources/js/components/ajax-delete-row.js
modified: resources/js/components/ajax-form.js
modified: resources/js/components/attachments-list.js
modified: resources/js/components/attachments.js
modified: resources/js/components/auto-suggest.js
modified: resources/js/components/back-to-top.js
modified: resources/js/components/book-sort.js
modified: resources/js/components/chapter-contents.js
modified: resources/js/components/code-editor.js
modified: resources/js/components/code-highlighter.js
modified: resources/js/components/code-textarea.js
modified: resources/js/components/collapsible.js
modified: resources/js/components/confirm-dialog.js
modified: resources/js/components/custom-checkbox.js
modified: resources/js/components/details-highlighter.js
modified: resources/js/components/dropdown-search.js
modified: resources/js/components/dropdown.js
modified: resources/js/components/dropzone.js
modified: resources/js/components/editor-toolbox.js
deleted: resources/js/components/entity-permissions-editor.js
modified: resources/js/components/entity-search.js
modified: resources/js/components/entity-selector-popup.js
modified: resources/js/components/entity-selector.js
modified: resources/js/components/event-emit-select.js
modified: resources/js/components/expand-toggle.js
modified: resources/js/components/header-mobile-toggle.js
deleted: resources/js/components/homepage-control.js
modified: resources/js/components/image-manager.js
modified: resources/js/components/image-picker.js
modified: resources/js/components/index.js
modified: resources/js/components/list-sort-control.js
modified: resources/js/components/markdown-editor.js
modified: resources/js/components/new-user-password.js
modified: resources/js/components/notification.js
modified: resources/js/components/optional-input.js
modified: resources/js/components/page-comments.js
modified: resources/js/components/page-display.js
modified: resources/js/components/page-editor.js
modified: resources/js/components/page-picker.js
modified: resources/js/components/permissions-table.js
modified: resources/js/components/popup.js
modified: resources/js/components/setting-app-color-picker.js
modified: resources/js/components/setting-color-picker.js
modified: resources/js/components/shelf-sort.js
deleted: resources/js/components/sidebar.js
modified: resources/js/components/sortable-list.js
modified: resources/js/components/submit-on-change.js
modified: resources/js/components/tabs.js
modified: resources/js/components/tag-manager.js
modified: resources/js/components/template-manager.js
modified: resources/js/components/toggle-switch.js
modified: resources/js/components/tri-layout.js
modified: resources/js/components/user-select.js
modified: resources/js/components/webhook-events.js
modified: resources/js/components/wysiwyg-editor.js
modified: resources/js/services/dom.js
modified: resources/js/services/util.js
modified: resources/js/wysiwyg/config.js
modified: resources/js/wysiwyg/plugin-codeeditor.js
modified: resources/js/wysiwyg/plugin-drawio.js
modified: resources/js/wysiwyg/plugins-customhr.js
modified: resources/js/wysiwyg/plugins-imagemanager.js
modified: resources/js/wysiwyg/shortcuts.js
modified: resources/js/wysiwyg/toolbars.js
modified: resources/lang/ar/activities.php
modified: resources/lang/ar/auth.php
modified: resources/lang/ar/common.php
modified: resources/lang/ar/editor.php
modified: resources/lang/ar/entities.php
modified: resources/lang/ar/settings.php
modified: resources/lang/bg/auth.php
modified: resources/lang/bg/common.php
modified: resources/lang/bg/editor.php
modified: resources/lang/bg/entities.php
modified: resources/lang/bg/settings.php
modified: resources/lang/bs/auth.php
modified: resources/lang/bs/common.php
modified: resources/lang/bs/editor.php
modified: resources/lang/bs/entities.php
modified: resources/lang/bs/settings.php
modified: resources/lang/ca/auth.php
modified: resources/lang/ca/common.php
modified: resources/lang/ca/editor.php
modified: resources/lang/ca/entities.php
modified: resources/lang/ca/settings.php
modified: resources/lang/cs/activities.php
modified: resources/lang/cs/auth.php
modified: resources/lang/cs/common.php
modified: resources/lang/cs/editor.php
modified: resources/lang/cs/entities.php
modified: resources/lang/cs/errors.php
modified: resources/lang/cs/passwords.php
modified: resources/lang/cs/settings.php
modified: resources/lang/cs/validation.php
modified: resources/lang/cy/auth.php
modified: resources/lang/cy/common.php
modified: resources/lang/cy/editor.php
modified: resources/lang/cy/entities.php
modified: resources/lang/cy/settings.php
modified: resources/lang/da/auth.php
modified: resources/lang/da/common.php
modified: resources/lang/da/editor.php
modified: resources/lang/da/entities.php
modified: resources/lang/da/settings.php
modified: resources/lang/de/activities.php
modified: resources/lang/de/auth.php
modified: resources/lang/de/common.php
modified: resources/lang/de/components.php
modified: resources/lang/de/editor.php
modified: resources/lang/de/entities.php
modified: resources/lang/de/errors.php
modified: resources/lang/de/settings.php
modified: resources/lang/de/validation.php
modified: resources/lang/de_informal/activities.php
modified: resources/lang/de_informal/auth.php
modified: resources/lang/de_informal/common.php
modified: resources/lang/de_informal/editor.php
modified: resources/lang/de_informal/entities.php
modified: resources/lang/de_informal/errors.php
modified: resources/lang/de_informal/settings.php
modified: resources/lang/en/auth.php
modified: resources/lang/en/common.php
modified: resources/lang/en/editor.php
modified: resources/lang/en/entities.php
modified: resources/lang/en/settings.php
modified: resources/lang/es/auth.php
modified: resources/lang/es/common.php
modified: resources/lang/es/editor.php
modified: resources/lang/es/entities.php
modified: resources/lang/es/settings.php
modified: resources/lang/es_AR/activities.php
modified: resources/lang/es_AR/auth.php
modified: resources/lang/es_AR/common.php
modified: resources/lang/es_AR/editor.php
modified: resources/lang/es_AR/entities.php
modified: resources/lang/es_AR/settings.php
modified: resources/lang/et/activities.php
modified: resources/lang/et/auth.php
modified: resources/lang/et/common.php
modified: resources/lang/et/editor.php
modified: resources/lang/et/entities.php
modified: resources/lang/et/errors.php
modified: resources/lang/et/settings.php
modified: resources/lang/eu/auth.php
modified: resources/lang/eu/common.php
modified: resources/lang/eu/editor.php
modified: resources/lang/eu/entities.php
modified: resources/lang/eu/settings.php
modified: resources/lang/fa/activities.php
modified: resources/lang/fa/auth.php
modified: resources/lang/fa/common.php
modified: resources/lang/fa/editor.php
modified: resources/lang/fa/entities.php
modified: resources/lang/fa/errors.php
modified: resources/lang/fa/settings.php
modified: resources/lang/fr/activities.php
modified: resources/lang/fr/auth.php
modified: resources/lang/fr/common.php
modified: resources/lang/fr/editor.php
modified: resources/lang/fr/entities.php
modified: resources/lang/fr/errors.php
modified: resources/lang/fr/settings.php
modified: resources/lang/he/auth.php
modified: resources/lang/he/common.php
modified: resources/lang/he/editor.php
modified: resources/lang/he/entities.php
modified: resources/lang/he/settings.php
modified: resources/lang/hr/auth.php
modified: resources/lang/hr/common.php
modified: resources/lang/hr/editor.php
modified: resources/lang/hr/entities.php
modified: resources/lang/hr/settings.php
modified: resources/lang/hu/auth.php
modified: resources/lang/hu/common.php
modified: resources/lang/hu/editor.php
modified: resources/lang/hu/entities.php
modified: resources/lang/hu/settings.php
modified: resources/lang/id/auth.php
modified: resources/lang/id/common.php
modified: resources/lang/id/editor.php
modified: resources/lang/id/entities.php
modified: resources/lang/id/settings.php
modified: resources/lang/it/auth.php
modified: resources/lang/it/common.php
modified: resources/lang/it/editor.php
modified: resources/lang/it/entities.php
modified: resources/lang/it/settings.php
modified: resources/lang/ja/activities.php
modified: resources/lang/ja/auth.php
modified: resources/lang/ja/common.php
modified: resources/lang/ja/editor.php
modified: resources/lang/ja/entities.php
modified: resources/lang/ja/errors.php
modified: resources/lang/ja/settings.php
modified: resources/lang/ko/activities.php
modified: resources/lang/ko/auth.php
modified: resources/lang/ko/common.php
modified: resources/lang/ko/editor.php
modified: resources/lang/ko/entities.php
modified: resources/lang/ko/settings.php
modified: resources/lang/lt/auth.php
modified: resources/lang/lt/common.php
modified: resources/lang/lt/editor.php
modified: resources/lang/lt/entities.php
modified: resources/lang/lt/settings.php
modified: resources/lang/lv/auth.php
modified: resources/lang/lv/common.php
modified: resources/lang/lv/editor.php
modified: resources/lang/lv/entities.php
modified: resources/lang/lv/settings.php
modified: resources/lang/nb/auth.php
modified: resources/lang/nb/common.php
modified: resources/lang/nb/editor.php
modified: resources/lang/nb/entities.php
modified: resources/lang/nb/settings.php
modified: resources/lang/nl/auth.php
modified: resources/lang/nl/common.php
modified: resources/lang/nl/editor.php
modified: resources/lang/nl/entities.php
modified: resources/lang/nl/settings.php
modified: resources/lang/pl/activities.php
modified: resources/lang/pl/auth.php
modified: resources/lang/pl/common.php
modified: resources/lang/pl/editor.php
modified: resources/lang/pl/entities.php
modified: resources/lang/pl/errors.php
modified: resources/lang/pl/settings.php
modified: resources/lang/pt/activities.php
modified: resources/lang/pt/auth.php
modified: resources/lang/pt/common.php
modified: resources/lang/pt/editor.php
modified: resources/lang/pt/entities.php
modified: resources/lang/pt/errors.php
modified: resources/lang/pt/settings.php
modified: resources/lang/pt_BR/activities.php
modified: resources/lang/pt_BR/auth.php
modified: resources/lang/pt_BR/common.php
modified: resources/lang/pt_BR/editor.php
modified: resources/lang/pt_BR/entities.php
modified: resources/lang/pt_BR/errors.php
modified: resources/lang/pt_BR/settings.php
modified: resources/lang/ru/activities.php
modified: resources/lang/ru/auth.php
modified: resources/lang/ru/common.php
modified: resources/lang/ru/editor.php
modified: resources/lang/ru/entities.php
modified: resources/lang/ru/errors.php
modified: resources/lang/ru/settings.php
modified: resources/lang/sk/auth.php
modified: resources/lang/sk/common.php
modified: resources/lang/sk/editor.php
modified: resources/lang/sk/entities.php
modified: resources/lang/sk/settings.php
modified: resources/lang/sl/auth.php
modified: resources/lang/sl/common.php
modified: resources/lang/sl/editor.php
modified: resources/lang/sl/entities.php
modified: resources/lang/sl/settings.php
modified: resources/lang/sv/activities.php
modified: resources/lang/sv/auth.php
modified: resources/lang/sv/common.php
modified: resources/lang/sv/editor.php
modified: resources/lang/sv/entities.php
modified: resources/lang/sv/errors.php
modified: resources/lang/sv/settings.php
modified: resources/lang/sv/validation.php
modified: resources/lang/tr/activities.php
modified: resources/lang/tr/auth.php
modified: resources/lang/tr/common.php
modified: resources/lang/tr/editor.php
modified: resources/lang/tr/entities.php
modified: resources/lang/tr/settings.php
modified: resources/lang/uk/activities.php
modified: resources/lang/uk/auth.php
modified: resources/lang/uk/common.php
modified: resources/lang/uk/editor.php
modified: resources/lang/uk/entities.php
modified: resources/lang/uk/errors.php
modified: resources/lang/uk/settings.php
modified: resources/lang/uz/auth.php
modified: resources/lang/uz/common.php
modified: resources/lang/uz/editor.php
modified: resources/lang/uz/entities.php
modified: resources/lang/uz/settings.php
modified: resources/lang/vi/auth.php
modified: resources/lang/vi/common.php
modified: resources/lang/vi/editor.php
modified: resources/lang/vi/entities.php
modified: resources/lang/vi/settings.php
modified: resources/lang/zh_CN/auth.php
modified: resources/lang/zh_CN/common.php
modified: resources/lang/zh_CN/editor.php
modified: resources/lang/zh_CN/entities.php
modified: resources/lang/zh_CN/settings.php
modified: resources/lang/zh_TW/activities.php
modified: resources/lang/zh_TW/auth.php
modified: resources/lang/zh_TW/common.php
modified: resources/lang/zh_TW/editor.php
modified: resources/lang/zh_TW/entities.php
modified: resources/lang/zh_TW/errors.php
modified: resources/lang/zh_TW/settings.php
modified: resources/lang/zh_TW/validation.php
modified: resources/sass/_animations.scss
modified: resources/sass/_blocks.scss
modified: resources/sass/_buttons.scss
modified: resources/sass/_components.scss
modified: resources/sass/_forms.scss
modified: resources/sass/_header.scss
modified: resources/sass/_layout.scss
modified: resources/sass/_lists.scss
modified: resources/sass/_pages.scss
modified: resources/sass/_spacing.scss
modified: resources/sass/_tables.scss
modified: resources/sass/_text.scss
modified: resources/sass/_variables.scss
modified: resources/sass/styles.scss
modified: resources/views/api-docs/index.blade.php
modified: resources/views/api-docs/parts/endpoint.blade.php
modified: resources/views/api-docs/parts/getting-started.blade.php
modified: resources/views/attachments/manager.blade.php
modified: resources/views/auth/login.blade.php
modified: resources/views/auth/register.blade.php
modified: resources/views/books/index.blade.php
modified: resources/views/books/parts/form.blade.php
modified: resources/views/books/parts/list.blade.php
modified: resources/views/books/parts/sort-box.blade.php
modified: resources/views/books/permissions.blade.php
modified: resources/views/books/show.blade.php
modified: resources/views/books/sort.blade.php
modified: resources/views/chapters/parts/form.blade.php
modified: resources/views/chapters/permissions.blade.php
modified: resources/views/chapters/show.blade.php
modified: resources/views/common/dark-mode-toggle.blade.php
modified: resources/views/common/header.blade.php
modified: resources/views/common/notifications.blade.php
modified: resources/views/entities/export-menu.blade.php
modified: resources/views/entities/favourite-action.blade.php
modified: resources/views/entities/search-form.blade.php
modified: resources/views/entities/sibling-navigation.blade.php
deleted: resources/views/entities/sort.blade.php
modified: resources/views/entities/view-toggle.blade.php
modified: resources/views/form/custom-checkbox.blade.php
modified: resources/views/form/entity-permissions.blade.php
modified: resources/views/form/image-picker.blade.php
deleted: resources/views/form/restriction-checkbox.blade.php
modified: resources/views/form/toggle-switch.blade.php
modified: resources/views/home/parts/expand-toggle.blade.php
modified: resources/views/home/shelves.blade.php
modified: resources/views/home/specific-page.blade.php
modified: resources/views/layouts/base.blade.php
modified: resources/views/pages/parts/code-editor.blade.php
modified: resources/views/pages/parts/editor-toolbox.blade.php
modified: resources/views/pages/parts/markdown-editor.blade.php
modified: resources/views/pages/parts/pointer.blade.php
deleted: resources/views/pages/parts/revision-table-row.blade.php
modified: resources/views/pages/parts/template-manager.blade.php
modified: resources/views/pages/permissions.blade.php
modified: resources/views/pages/revisions.blade.php
modified: resources/views/pages/show.blade.php
modified: resources/views/search/all.blade.php
deleted: resources/views/search/parts/entity-ajax-list.blade.php
modified: resources/views/search/parts/term-list.blade.php
modified: resources/views/settings/audit.blade.php
modified: resources/views/settings/customization.blade.php
modified: resources/views/settings/parts/page-picker.blade.php
modified: resources/views/settings/parts/setting-entity-color-picker.blade.php
modified: resources/views/settings/parts/table-user.blade.php
modified: resources/views/settings/recycle-bin/index.blade.php
modified: resources/views/settings/roles/index.blade.php
modified: resources/views/settings/roles/parts/form.blade.php
modified: resources/views/settings/webhooks/index.blade.php
modified: resources/views/shelves/index.blade.php
modified: resources/views/shelves/parts/form.blade.php
modified: resources/views/shelves/parts/list.blade.php
modified: resources/views/shelves/permissions.blade.php
modified: resources/views/shelves/show.blade.php
modified: resources/views/tags/index.blade.php
deleted: resources/views/tags/parts/table-row.blade.php
modified: resources/views/users/api-tokens/parts/list.blade.php
modified: resources/views/users/index.blade.php
modified: resources/views/users/parts/form.blade.php
modified: routes/api.php
modified: routes/web.php
modified: tests/Actions/AuditLogTest.php
modified: tests/Actions/WebhookCallTest.php
modified: tests/Actions/WebhookFormatTesting.php
modified: tests/Api/AttachmentsApiTest.php
modified: tests/Api/BooksApiTest.php
modified: tests/Api/ChaptersApiTest.php
modified: tests/Api/PagesApiTest.php
modified: tests/Api/RecycleBinApiTest.php
modified: tests/Api/SearchApiTest.php
modified: tests/Api/UsersApiTest.php
modified: tests/Auth/AuthTest.php
modified: tests/Auth/OidcTest.php
modified: tests/Auth/Saml2Test.php
modified: tests/Auth/UserInviteTest.php
modified: tests/Commands/ClearActivityCommandTest.php
modified: tests/Commands/CopyShelfPermissionsCommandTest.php
modified: tests/Commands/RegenerateReferencesCommandTest.php
modified: tests/Commands/UpdateUrlCommandTest.php
modified: tests/Entity/BookShelfTest.php
modified: tests/Entity/BookTest.php
modified: tests/Entity/ChapterTest.php
modified: tests/Entity/CommentSettingTest.php
modified: tests/Entity/CommentTest.php
modified: tests/Entity/ConvertTest.php
modified: tests/Entity/EntityAccessTest.php
modified: tests/Entity/EntitySearchTest.php
modified: tests/Entity/ExportTest.php
modified: tests/Entity/PageContentTest.php
modified: tests/Entity/PageDraftTest.php
modified: tests/Entity/PageEditorTest.php
modified: tests/Entity/PageRevisionTest.php
modified: tests/Entity/PageTemplateTest.php
modified: tests/Entity/PageTest.php
modified: tests/Entity/SortTest.php
modified: tests/Entity/TagTest.php
modified: tests/ErrorTest.php
modified: tests/FavouriteTest.php
modified: tests/HomepageTest.php
modified: tests/OpenGraphTest.php
modified: tests/Permissions/EntityOwnerChangeTest.php
modified: tests/Permissions/EntityPermissionsTest.php
modified: tests/Permissions/ExportPermissionsTest.php
modified: tests/Permissions/RolesTest.php
modified: tests/PublicActionTest.php
modified: tests/Settings/RecycleBinTest.php
modified: tests/TestCase.php
modified: tests/ThemeTest.php
modified: tests/Uploads/AttachmentTest.php
modified: tests/Uploads/ImageTest.php
modified: tests/Uploads/UsesImages.php
modified: tests/UrlTest.php
modified: tests/User/UserManagementTest.php
modified: tests/User/UserPreferencesTest.php
modified: tests/User/UserProfileTest.php
modified: version

Untracked files:
(use "git add ..." to include in what will be committed)
.github/workflows/analyse-php.yml
.github/workflows/lint-php.yml
.github/workflows/test-php.yml
app/Actions/Queries/
app/Api/ApiEntityListFormatter.php
app/Auth/Permissions/PermissionFormData.php
app/Auth/Queries/RolesAllPaginatedAndSorted.php
app/Auth/Queries/UsersAllPaginatedAndSorted.php
app/Http/Controllers/Auth/ThrottlesLogins.php
app/Http/Controllers/PermissionsController.php
app/Http/Controllers/UserPreferencesController.php
app/Providers/ValidationRuleServiceProvider.php
app/Providers/ViewTweaksServiceProvider.php
app/Settings/UserShortcutMap.php
app/Util/SimpleListOptions.php
database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php
database/migrations/2022_10_08_104202_drop_entity_restricted_field.php
dev/docs/development.md
dev/docs/javascript-code.md
dev/docs/release-process.md
phpcs.xml
resources/icons/groups.svg
resources/icons/role.svg
resources/icons/shortcuts.svg
resources/js/components/auto-submit.js
resources/js/components/component.js
resources/js/components/entity-permissions.js
resources/js/components/global-search.js
resources/js/components/pointer.js
resources/js/components/setting-homepage-control.js
resources/js/components/shortcut-input.js
resources/js/components/shortcuts.js
resources/js/markdown/
resources/js/services/components.js
resources/js/services/keyboard-navigation.js
resources/js/services/text.js
resources/js/wysiwyg/icons.js
resources/lang/ar/preferences.php
resources/lang/bg/preferences.php
resources/lang/bs/preferences.php
resources/lang/ca/preferences.php
resources/lang/cs/preferences.php
resources/lang/cy/preferences.php
resources/lang/da/preferences.php
resources/lang/de/preferences.php
resources/lang/de_informal/preferences.php
resources/lang/el/
resources/lang/en/preferences.php
resources/lang/es/preferences.php
resources/lang/es_AR/preferences.php
resources/lang/et/preferences.php
resources/lang/eu/preferences.php
resources/lang/fa/preferences.php
resources/lang/fr/preferences.php
resources/lang/he/preferences.php
resources/lang/hr/preferences.php
resources/lang/hu/preferences.php
resources/lang/id/preferences.php
resources/lang/it/preferences.php
resources/lang/ja/preferences.php
resources/lang/ka/
resources/lang/ko/preferences.php
resources/lang/lt/preferences.php
resources/lang/lv/preferences.php
resources/lang/nb/preferences.php
resources/lang/nl/preferences.php
resources/lang/pl/preferences.php
resources/lang/pt/preferences.php
resources/lang/pt_BR/preferences.php
resources/lang/ru/preferences.php
resources/lang/sk/preferences.php
resources/lang/sl/preferences.php
resources/lang/sv/preferences.php
resources/lang/tr/preferences.php
resources/lang/uk/preferences.php
resources/lang/uz/preferences.php
resources/lang/vi/preferences.php
resources/lang/zh_CN/preferences.php
resources/lang/zh_TW/preferences.php
resources/sass/_opacity.scss
resources/views/auth/parts/login-message.blade.php
resources/views/auth/parts/register-message.blade.php
resources/views/auth/register-confirm-accept.blade.php
resources/views/common/sort.blade.php
resources/views/common/status-indicator.blade.php
resources/views/form/entity-permissions-row.blade.php
resources/views/pages/parts/revisions-index-row.blade.php
resources/views/search/parts/entity-selector-list.blade.php
resources/views/search/parts/entity-suggestion-list.blade.php
resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php
resources/views/settings/roles/parts/asset-permissions-row.blade.php
resources/views/settings/roles/parts/related-asset-permissions-row.blade.php
resources/views/settings/roles/parts/roles-list-item.blade.php
resources/views/settings/webhooks/parts/webhooks-list-item.blade.php
resources/views/tags/parts/tags-list-item.blade.php
resources/views/users/parts/users-list-item.blade.php
resources/views/users/preferences/
tests/Auth/RegistrationTest.php
tests/Auth/ResetPasswordTest.php
tests/Helpers/EntityProvider.php
tests/Helpers/TestServiceProvider.php

no changes added to commit (use "git add" and/or "git commit -a")

Sorry is there a possibility to make such text block collapsable?

@helson22 commented on GitHub (Dec 7, 2022): Ok, question who should own all the files an directories? www-data? Can different permissions cause such mess? From https://github.com/BookStackApp/BookStack * branch release -> FETCH_HEAD Updating 2ac9efae..bf6a6af6 **error: Your local changes to the following files would be overwritten by merge:** .github/translators.txt .github/workflows/test-migrations.yml LICENSE app/Actions/TagRepo.php app/Actions/Webhook.php app/Actions/WebhookTrackedEvent.php app/Api/ListingResponseBuilder.php app/Auth/Access/LdapService.php app/Auth/Access/LoginService.php app/Auth/Access/Oidc/OidcJwtSigningKey.php app/Auth/Access/Oidc/OidcProviderSettings.php app/Auth/Access/Oidc/OidcService.php app/Auth/Access/Saml2Service.php app/Auth/Permissions/EntityPermission.php app/Auth/Permissions/JointPermissionBuilder.php app/Auth/Permissions/PermissionApplicator.php app/Auth/Permissions/PermissionsRepo.php app/Auth/Permissions/SimpleEntityData.php app/Auth/Role.php app/Auth/UserRepo.php app/Config/app.php app/Config/dompdf.php app/Config/setting-defaults.php app/Config/snappy.php app/Console/Commands/CopyShelfPermissions.php app/Entities/Models/Book.php app/Entities/Models/Bookshelf.php app/Entities/Models/Chapter.php app/Entities/Models/Entity.php app/Entities/Models/Page.php app/Entities/Models/PageRevision.php app/Entities/Repos/BaseRepo.php app/Entities/Repos/BookshelfRepo.php app/Entities/Tools/BookContents.php app/Entities/Tools/Cloner.php app/Entities/Tools/HierarchyTransformer.php app/Entities/Tools/PageEditActivity.php app/Entities/Tools/PermissionsUpdater.php app/Http/Controllers/Api/BookApiController.php app/Http/Controllers/Api/BookshelfApiController.php app/Http/Controllers/Api/SearchApiController.php app/Http/Controllers/AuditLogController.php app/Http/Controllers/Auth/ConfirmEmailController.php app/Http/Controllers/Auth/ForgotPasswordController.php app/Http/Controllers/Auth/LoginController.php app/Http/Controllers/Auth/RegisterController.php app/Http/Controllers/Auth/ResetPasswordController.php app/Http/Controllers/Auth/Saml2Controller.php app/Http/Controllers/Auth/SocialController.php app/Http/Controllers/Auth/UserInviteController.php app/Http/Controllers/BookController.php app/Http/Controllers/BookSortController.php app/Http/Controllers/BookshelfController.php app/Http/Controllers/ChapterController.php app/Http/Controllers/FavouriteController.php app/Http/Controllers/HomeController.php app/Http/Controllers/PageController.php app/Http/Controllers/PageRevisionController.php app/Http/Controllers/ReferenceController.php app/Http/Controllers/RoleController.php app/Http/Controllers/SearchController.php app/Http/Controllers/TagController.php app/Http/Controllers/UserController.php app/Http/Controllers/WebhookController.php app/Providers/AppServiceProvider.php app/Providers/AuthServiceProvider.php app/Providers/EventServiceProvider.php app/Providers/RouteServiceProvider.php app/Providers/ThemeServiceProvider.php app/Settings/SettingService.php app/Uploads/ImageService.php app/Util/LanguageManager.php composer.json composer.lock dev/api/responses/books-read.json package-lock.json package.json public/dist/app.js public/dist/code.js public/dist/export-styles.css public/dist/print-styles.css public/dist/styles.css readme.md resources/icons/image.svg resources/js/app.js resources/js/code.mjs resources/js/components/add-remove-rows.js resources/js/components/ajax-delete-row.js resources/js/components/ajax-form.js resources/js/components/attachments-list.js resources/js/components/attachments.js resources/js/components/auto-suggest.js resources/js/components/back-to-top.js resources/js/components/book-sort.js resources/js/components/chapter-contents.js resources/js/components/code-editor.js resources/js/components/code-highlighter.js resources/js/components/code-textarea.js resources/js/components/collapsible.js resources/js/components/confirm-dialog.js resources/js/components/custom-checkbox.js resources/js/components/details-highlighter.js resources/js/components/dropdown-search.js resources/js/components/dropdown.js resources/js/components/dropzone.js resources/js/components/editor-toolbox.js resources/js/components/entity-search.js resources/js/componen **error: The following untracked working tree files would be overwritten by merge:** .github/workflows/analyse-php.yml .github/workflows/lint-php.yml .github/workflows/test-php.yml app/Actions/Queries/WebhooksAllPaginatedAndSorted.php app/Api/ApiEntityListFormatter.php app/Auth/Permissions/PermissionFormData.php app/Auth/Queries/RolesAllPaginatedAndSorted.php app/Auth/Queries/UsersAllPaginatedAndSorted.php app/Http/Controllers/Auth/ThrottlesLogins.php app/Http/Controllers/PermissionsController.php app/Http/Controllers/UserPreferencesController.php app/Providers/ValidationRuleServiceProvider.php app/Providers/ViewTweaksServiceProvider.php app/Settings/UserShortcutMap.php app/Util/SimpleListOptions.php database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php database/migrations/2022_10_08_104202_drop_entity_restricted_field.php dev/docs/development.md dev/docs/javascript-code.md dev/docs/release-process.md phpcs.xml resources/icons/groups.svg resources/icons/role.svg resources/icons/shortcuts.svg resources/js/components/auto-submit.js resources/js/components/component.js resources/js/components/entity-permissions.js resources/js/components/global-search.js resources/js/components/pointer.js resources/js/components/setting-homepage-control.js resources/js/components/shortcut-input.js resources/js/components/shortcuts.js resources/js/markdown/actions.js resources/js/markdown/codemirror.js resources/js/markdown/common-events.js resources/js/markdown/display.js resources/js/markdown/editor.js resources/js/markdown/markdown.js resources/js/markdown/settings.js resources/js/markdown/shortcuts.js resources/js/services/components.js resources/js/services/keyboard-navigation.js resources/js/services/text.js resources/js/wysiwyg/icons.js resources/lang/ar/preferences.php resources/lang/bg/preferences.php resources/lang/bs/preferences.php resources/lang/ca/preferences.php resources/lang/cs/preferences.php resources/lang/cy/preferences.php resources/lang/da/preferences.php resources/lang/de/preferences.php resources/lang/de_informal/preferences.php resources/lang/el/activities.php resources/lang/el/auth.php resources/lang/el/common.php resources/lang/el/components.php resources/lang/el/editor.php resources/lang/el/entities.php resources/lang/el/errors.php resources/lang/el/pagination.php resources/lang/el/passwords.php resources/lang/el/preferences.php resources/lang/el/settings.php resources/lang/el/validation.php resources/lang/en/preferences.php resources/lang/es/preferences.php resources/lang/es_AR/preferences.php resources/lang/et/preferences.php resources/lang/eu/preferences.php resources/lang/fa/preferences.php resources/lang/fr/preferences.php resources/lang/he/preferences.php resources/lang/hr/preferences.php resources/lang/hu/preferences.php resources/lang/id/preferences.php resources/lang/it/preferences.php resources/lang/ja/preferences.php resources/lang/ka/activities.php resources/lang/ka/auth.php resources/lang/ka/common.php resources/lang/ka/components.php resources/lang/ka/editor.php resources/lang/ka/entities.php resources/lang/ka/errors.php resources/lang/ka/pagination.php resources/lang/ka/passwords.php resources/lang/ka/preferences.php resources/lang/ka/settings.php resources/lang/ka/validation.php resources/lang/ko/preferences.php resources/lang/lt/preferences.php resources/lang/lv/preferences.php resources/lang/nb/preferences.php resources/lang/nl/preferences.php resources/lang/pl/preferences.php resources/lang/pt/preferences.php resources/lang/pt_BR/preferences.php resources/lang/ru/preferences.php resources/lang/sk/preferences.php resources/lang/sl/preferences.php resources/lang/sv/preferences.php resources/lang/tr/preferences.php resources/lang/uk/preferences.php resources/lang/uz/preferences.php resources/lang/vi/preferences.php resources/lang/zh_CN/preferences.php resources/lang/zh_TW/preferences.php resources/sass/_opacity.scss resources/views/auth/parts/login-message.blade.php resou Aborting git status On branch release Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: .github/translators.txt deleted: .github/workflows/phpstan.yml deleted: .github/workflows/phpunit.yml modified: .github/workflows/test-migrations.yml modified: LICENSE modified: app/Actions/TagRepo.php modified: app/Actions/Webhook.php modified: app/Actions/WebhookTrackedEvent.php modified: app/Api/ListingResponseBuilder.php modified: app/Auth/Access/LdapService.php modified: app/Auth/Access/LoginService.php modified: app/Auth/Access/Oidc/OidcJwtSigningKey.php modified: app/Auth/Access/Oidc/OidcProviderSettings.php modified: app/Auth/Access/Oidc/OidcService.php modified: app/Auth/Access/Saml2Service.php modified: app/Auth/Permissions/EntityPermission.php modified: app/Auth/Permissions/JointPermissionBuilder.php modified: app/Auth/Permissions/PermissionApplicator.php modified: app/Auth/Permissions/PermissionsRepo.php modified: app/Auth/Permissions/SimpleEntityData.php deleted: app/Auth/Queries/AllUsersPaginatedAndSorted.php modified: app/Auth/Role.php modified: app/Auth/UserRepo.php modified: app/Config/app.php modified: app/Config/dompdf.php modified: app/Config/setting-defaults.php modified: app/Config/snappy.php modified: app/Console/Commands/CopyShelfPermissions.php modified: app/Entities/Models/Book.php modified: app/Entities/Models/Bookshelf.php modified: app/Entities/Models/Chapter.php modified: app/Entities/Models/Entity.php modified: app/Entities/Models/Page.php modified: app/Entities/Models/PageRevision.php modified: app/Entities/Repos/BaseRepo.php modified: app/Entities/Repos/BookshelfRepo.php modified: app/Entities/Tools/BookContents.php modified: app/Entities/Tools/Cloner.php modified: app/Entities/Tools/HierarchyTransformer.php modified: app/Entities/Tools/PageEditActivity.php modified: app/Entities/Tools/PermissionsUpdater.php modified: app/Http/Controllers/Api/BookApiController.php modified: app/Http/Controllers/Api/BookshelfApiController.php modified: app/Http/Controllers/Api/SearchApiController.php modified: app/Http/Controllers/AuditLogController.php modified: app/Http/Controllers/Auth/ConfirmEmailController.php modified: app/Http/Controllers/Auth/ForgotPasswordController.php modified: app/Http/Controllers/Auth/LoginController.php modified: app/Http/Controllers/Auth/RegisterController.php modified: app/Http/Controllers/Auth/ResetPasswordController.php modified: app/Http/Controllers/Auth/Saml2Controller.php modified: app/Http/Controllers/Auth/SocialController.php modified: app/Http/Controllers/Auth/UserInviteController.php modified: app/Http/Controllers/BookController.php modified: app/Http/Controllers/BookSortController.php modified: app/Http/Controllers/BookshelfController.php modified: app/Http/Controllers/ChapterController.php modified: app/Http/Controllers/FavouriteController.php modified: app/Http/Controllers/HomeController.php modified: app/Http/Controllers/PageController.php modified: app/Http/Controllers/PageRevisionController.php modified: app/Http/Controllers/ReferenceController.php modified: app/Http/Controllers/RoleController.php modified: app/Http/Controllers/SearchController.php modified: app/Http/Controllers/TagController.php modified: app/Http/Controllers/UserController.php modified: app/Http/Controllers/WebhookController.php modified: app/Providers/AppServiceProvider.php modified: app/Providers/AuthServiceProvider.php deleted: app/Providers/BroadcastServiceProvider.php deleted: app/Providers/CustomFacadeProvider.php deleted: app/Providers/CustomValidationServiceProvider.php modified: app/Providers/EventServiceProvider.php deleted: app/Providers/PaginationServiceProvider.php modified: app/Providers/RouteServiceProvider.php modified: app/Providers/ThemeServiceProvider.php modified: app/Settings/SettingService.php modified: app/Uploads/ImageService.php modified: app/Util/LanguageManager.php modified: composer.json modified: composer.lock modified: dev/api/responses/books-read.json deleted: dev/docs/components.md modified: package-lock.json modified: package.json modified: public/dist/app.js modified: public/dist/code.js modified: public/dist/export-styles.css modified: public/dist/print-styles.css modified: public/dist/styles.css modified: readme.md modified: resources/icons/image.svg modified: resources/js/app.js modified: resources/js/code.mjs modified: resources/js/components/add-remove-rows.js modified: resources/js/components/ajax-delete-row.js modified: resources/js/components/ajax-form.js modified: resources/js/components/attachments-list.js modified: resources/js/components/attachments.js modified: resources/js/components/auto-suggest.js modified: resources/js/components/back-to-top.js modified: resources/js/components/book-sort.js modified: resources/js/components/chapter-contents.js modified: resources/js/components/code-editor.js modified: resources/js/components/code-highlighter.js modified: resources/js/components/code-textarea.js modified: resources/js/components/collapsible.js modified: resources/js/components/confirm-dialog.js modified: resources/js/components/custom-checkbox.js modified: resources/js/components/details-highlighter.js modified: resources/js/components/dropdown-search.js modified: resources/js/components/dropdown.js modified: resources/js/components/dropzone.js modified: resources/js/components/editor-toolbox.js deleted: resources/js/components/entity-permissions-editor.js modified: resources/js/components/entity-search.js modified: resources/js/components/entity-selector-popup.js modified: resources/js/components/entity-selector.js modified: resources/js/components/event-emit-select.js modified: resources/js/components/expand-toggle.js modified: resources/js/components/header-mobile-toggle.js deleted: resources/js/components/homepage-control.js modified: resources/js/components/image-manager.js modified: resources/js/components/image-picker.js modified: resources/js/components/index.js modified: resources/js/components/list-sort-control.js modified: resources/js/components/markdown-editor.js modified: resources/js/components/new-user-password.js modified: resources/js/components/notification.js modified: resources/js/components/optional-input.js modified: resources/js/components/page-comments.js modified: resources/js/components/page-display.js modified: resources/js/components/page-editor.js modified: resources/js/components/page-picker.js modified: resources/js/components/permissions-table.js modified: resources/js/components/popup.js modified: resources/js/components/setting-app-color-picker.js modified: resources/js/components/setting-color-picker.js modified: resources/js/components/shelf-sort.js deleted: resources/js/components/sidebar.js modified: resources/js/components/sortable-list.js modified: resources/js/components/submit-on-change.js modified: resources/js/components/tabs.js modified: resources/js/components/tag-manager.js modified: resources/js/components/template-manager.js modified: resources/js/components/toggle-switch.js modified: resources/js/components/tri-layout.js modified: resources/js/components/user-select.js modified: resources/js/components/webhook-events.js modified: resources/js/components/wysiwyg-editor.js modified: resources/js/services/dom.js modified: resources/js/services/util.js modified: resources/js/wysiwyg/config.js modified: resources/js/wysiwyg/plugin-codeeditor.js modified: resources/js/wysiwyg/plugin-drawio.js modified: resources/js/wysiwyg/plugins-customhr.js modified: resources/js/wysiwyg/plugins-imagemanager.js modified: resources/js/wysiwyg/shortcuts.js modified: resources/js/wysiwyg/toolbars.js modified: resources/lang/ar/activities.php modified: resources/lang/ar/auth.php modified: resources/lang/ar/common.php modified: resources/lang/ar/editor.php modified: resources/lang/ar/entities.php modified: resources/lang/ar/settings.php modified: resources/lang/bg/auth.php modified: resources/lang/bg/common.php modified: resources/lang/bg/editor.php modified: resources/lang/bg/entities.php modified: resources/lang/bg/settings.php modified: resources/lang/bs/auth.php modified: resources/lang/bs/common.php modified: resources/lang/bs/editor.php modified: resources/lang/bs/entities.php modified: resources/lang/bs/settings.php modified: resources/lang/ca/auth.php modified: resources/lang/ca/common.php modified: resources/lang/ca/editor.php modified: resources/lang/ca/entities.php modified: resources/lang/ca/settings.php modified: resources/lang/cs/activities.php modified: resources/lang/cs/auth.php modified: resources/lang/cs/common.php modified: resources/lang/cs/editor.php modified: resources/lang/cs/entities.php modified: resources/lang/cs/errors.php modified: resources/lang/cs/passwords.php modified: resources/lang/cs/settings.php modified: resources/lang/cs/validation.php modified: resources/lang/cy/auth.php modified: resources/lang/cy/common.php modified: resources/lang/cy/editor.php modified: resources/lang/cy/entities.php modified: resources/lang/cy/settings.php modified: resources/lang/da/auth.php modified: resources/lang/da/common.php modified: resources/lang/da/editor.php modified: resources/lang/da/entities.php modified: resources/lang/da/settings.php modified: resources/lang/de/activities.php modified: resources/lang/de/auth.php modified: resources/lang/de/common.php modified: resources/lang/de/components.php modified: resources/lang/de/editor.php modified: resources/lang/de/entities.php modified: resources/lang/de/errors.php modified: resources/lang/de/settings.php modified: resources/lang/de/validation.php modified: resources/lang/de_informal/activities.php modified: resources/lang/de_informal/auth.php modified: resources/lang/de_informal/common.php modified: resources/lang/de_informal/editor.php modified: resources/lang/de_informal/entities.php modified: resources/lang/de_informal/errors.php modified: resources/lang/de_informal/settings.php modified: resources/lang/en/auth.php modified: resources/lang/en/common.php modified: resources/lang/en/editor.php modified: resources/lang/en/entities.php modified: resources/lang/en/settings.php modified: resources/lang/es/auth.php modified: resources/lang/es/common.php modified: resources/lang/es/editor.php modified: resources/lang/es/entities.php modified: resources/lang/es/settings.php modified: resources/lang/es_AR/activities.php modified: resources/lang/es_AR/auth.php modified: resources/lang/es_AR/common.php modified: resources/lang/es_AR/editor.php modified: resources/lang/es_AR/entities.php modified: resources/lang/es_AR/settings.php modified: resources/lang/et/activities.php modified: resources/lang/et/auth.php modified: resources/lang/et/common.php modified: resources/lang/et/editor.php modified: resources/lang/et/entities.php modified: resources/lang/et/errors.php modified: resources/lang/et/settings.php modified: resources/lang/eu/auth.php modified: resources/lang/eu/common.php modified: resources/lang/eu/editor.php modified: resources/lang/eu/entities.php modified: resources/lang/eu/settings.php modified: resources/lang/fa/activities.php modified: resources/lang/fa/auth.php modified: resources/lang/fa/common.php modified: resources/lang/fa/editor.php modified: resources/lang/fa/entities.php modified: resources/lang/fa/errors.php modified: resources/lang/fa/settings.php modified: resources/lang/fr/activities.php modified: resources/lang/fr/auth.php modified: resources/lang/fr/common.php modified: resources/lang/fr/editor.php modified: resources/lang/fr/entities.php modified: resources/lang/fr/errors.php modified: resources/lang/fr/settings.php modified: resources/lang/he/auth.php modified: resources/lang/he/common.php modified: resources/lang/he/editor.php modified: resources/lang/he/entities.php modified: resources/lang/he/settings.php modified: resources/lang/hr/auth.php modified: resources/lang/hr/common.php modified: resources/lang/hr/editor.php modified: resources/lang/hr/entities.php modified: resources/lang/hr/settings.php modified: resources/lang/hu/auth.php modified: resources/lang/hu/common.php modified: resources/lang/hu/editor.php modified: resources/lang/hu/entities.php modified: resources/lang/hu/settings.php modified: resources/lang/id/auth.php modified: resources/lang/id/common.php modified: resources/lang/id/editor.php modified: resources/lang/id/entities.php modified: resources/lang/id/settings.php modified: resources/lang/it/auth.php modified: resources/lang/it/common.php modified: resources/lang/it/editor.php modified: resources/lang/it/entities.php modified: resources/lang/it/settings.php modified: resources/lang/ja/activities.php modified: resources/lang/ja/auth.php modified: resources/lang/ja/common.php modified: resources/lang/ja/editor.php modified: resources/lang/ja/entities.php modified: resources/lang/ja/errors.php modified: resources/lang/ja/settings.php modified: resources/lang/ko/activities.php modified: resources/lang/ko/auth.php modified: resources/lang/ko/common.php modified: resources/lang/ko/editor.php modified: resources/lang/ko/entities.php modified: resources/lang/ko/settings.php modified: resources/lang/lt/auth.php modified: resources/lang/lt/common.php modified: resources/lang/lt/editor.php modified: resources/lang/lt/entities.php modified: resources/lang/lt/settings.php modified: resources/lang/lv/auth.php modified: resources/lang/lv/common.php modified: resources/lang/lv/editor.php modified: resources/lang/lv/entities.php modified: resources/lang/lv/settings.php modified: resources/lang/nb/auth.php modified: resources/lang/nb/common.php modified: resources/lang/nb/editor.php modified: resources/lang/nb/entities.php modified: resources/lang/nb/settings.php modified: resources/lang/nl/auth.php modified: resources/lang/nl/common.php modified: resources/lang/nl/editor.php modified: resources/lang/nl/entities.php modified: resources/lang/nl/settings.php modified: resources/lang/pl/activities.php modified: resources/lang/pl/auth.php modified: resources/lang/pl/common.php modified: resources/lang/pl/editor.php modified: resources/lang/pl/entities.php modified: resources/lang/pl/errors.php modified: resources/lang/pl/settings.php modified: resources/lang/pt/activities.php modified: resources/lang/pt/auth.php modified: resources/lang/pt/common.php modified: resources/lang/pt/editor.php modified: resources/lang/pt/entities.php modified: resources/lang/pt/errors.php modified: resources/lang/pt/settings.php modified: resources/lang/pt_BR/activities.php modified: resources/lang/pt_BR/auth.php modified: resources/lang/pt_BR/common.php modified: resources/lang/pt_BR/editor.php modified: resources/lang/pt_BR/entities.php modified: resources/lang/pt_BR/errors.php modified: resources/lang/pt_BR/settings.php modified: resources/lang/ru/activities.php modified: resources/lang/ru/auth.php modified: resources/lang/ru/common.php modified: resources/lang/ru/editor.php modified: resources/lang/ru/entities.php modified: resources/lang/ru/errors.php modified: resources/lang/ru/settings.php modified: resources/lang/sk/auth.php modified: resources/lang/sk/common.php modified: resources/lang/sk/editor.php modified: resources/lang/sk/entities.php modified: resources/lang/sk/settings.php modified: resources/lang/sl/auth.php modified: resources/lang/sl/common.php modified: resources/lang/sl/editor.php modified: resources/lang/sl/entities.php modified: resources/lang/sl/settings.php modified: resources/lang/sv/activities.php modified: resources/lang/sv/auth.php modified: resources/lang/sv/common.php modified: resources/lang/sv/editor.php modified: resources/lang/sv/entities.php modified: resources/lang/sv/errors.php modified: resources/lang/sv/settings.php modified: resources/lang/sv/validation.php modified: resources/lang/tr/activities.php modified: resources/lang/tr/auth.php modified: resources/lang/tr/common.php modified: resources/lang/tr/editor.php modified: resources/lang/tr/entities.php modified: resources/lang/tr/settings.php modified: resources/lang/uk/activities.php modified: resources/lang/uk/auth.php modified: resources/lang/uk/common.php modified: resources/lang/uk/editor.php modified: resources/lang/uk/entities.php modified: resources/lang/uk/errors.php modified: resources/lang/uk/settings.php modified: resources/lang/uz/auth.php modified: resources/lang/uz/common.php modified: resources/lang/uz/editor.php modified: resources/lang/uz/entities.php modified: resources/lang/uz/settings.php modified: resources/lang/vi/auth.php modified: resources/lang/vi/common.php modified: resources/lang/vi/editor.php modified: resources/lang/vi/entities.php modified: resources/lang/vi/settings.php modified: resources/lang/zh_CN/auth.php modified: resources/lang/zh_CN/common.php modified: resources/lang/zh_CN/editor.php modified: resources/lang/zh_CN/entities.php modified: resources/lang/zh_CN/settings.php modified: resources/lang/zh_TW/activities.php modified: resources/lang/zh_TW/auth.php modified: resources/lang/zh_TW/common.php modified: resources/lang/zh_TW/editor.php modified: resources/lang/zh_TW/entities.php modified: resources/lang/zh_TW/errors.php modified: resources/lang/zh_TW/settings.php modified: resources/lang/zh_TW/validation.php modified: resources/sass/_animations.scss modified: resources/sass/_blocks.scss modified: resources/sass/_buttons.scss modified: resources/sass/_components.scss modified: resources/sass/_forms.scss modified: resources/sass/_header.scss modified: resources/sass/_layout.scss modified: resources/sass/_lists.scss modified: resources/sass/_pages.scss modified: resources/sass/_spacing.scss modified: resources/sass/_tables.scss modified: resources/sass/_text.scss modified: resources/sass/_variables.scss modified: resources/sass/styles.scss modified: resources/views/api-docs/index.blade.php modified: resources/views/api-docs/parts/endpoint.blade.php modified: resources/views/api-docs/parts/getting-started.blade.php modified: resources/views/attachments/manager.blade.php modified: resources/views/auth/login.blade.php modified: resources/views/auth/register.blade.php modified: resources/views/books/index.blade.php modified: resources/views/books/parts/form.blade.php modified: resources/views/books/parts/list.blade.php modified: resources/views/books/parts/sort-box.blade.php modified: resources/views/books/permissions.blade.php modified: resources/views/books/show.blade.php modified: resources/views/books/sort.blade.php modified: resources/views/chapters/parts/form.blade.php modified: resources/views/chapters/permissions.blade.php modified: resources/views/chapters/show.blade.php modified: resources/views/common/dark-mode-toggle.blade.php modified: resources/views/common/header.blade.php modified: resources/views/common/notifications.blade.php modified: resources/views/entities/export-menu.blade.php modified: resources/views/entities/favourite-action.blade.php modified: resources/views/entities/search-form.blade.php modified: resources/views/entities/sibling-navigation.blade.php deleted: resources/views/entities/sort.blade.php modified: resources/views/entities/view-toggle.blade.php modified: resources/views/form/custom-checkbox.blade.php modified: resources/views/form/entity-permissions.blade.php modified: resources/views/form/image-picker.blade.php deleted: resources/views/form/restriction-checkbox.blade.php modified: resources/views/form/toggle-switch.blade.php modified: resources/views/home/parts/expand-toggle.blade.php modified: resources/views/home/shelves.blade.php modified: resources/views/home/specific-page.blade.php modified: resources/views/layouts/base.blade.php modified: resources/views/pages/parts/code-editor.blade.php modified: resources/views/pages/parts/editor-toolbox.blade.php modified: resources/views/pages/parts/markdown-editor.blade.php modified: resources/views/pages/parts/pointer.blade.php deleted: resources/views/pages/parts/revision-table-row.blade.php modified: resources/views/pages/parts/template-manager.blade.php modified: resources/views/pages/permissions.blade.php modified: resources/views/pages/revisions.blade.php modified: resources/views/pages/show.blade.php modified: resources/views/search/all.blade.php deleted: resources/views/search/parts/entity-ajax-list.blade.php modified: resources/views/search/parts/term-list.blade.php modified: resources/views/settings/audit.blade.php modified: resources/views/settings/customization.blade.php modified: resources/views/settings/parts/page-picker.blade.php modified: resources/views/settings/parts/setting-entity-color-picker.blade.php modified: resources/views/settings/parts/table-user.blade.php modified: resources/views/settings/recycle-bin/index.blade.php modified: resources/views/settings/roles/index.blade.php modified: resources/views/settings/roles/parts/form.blade.php modified: resources/views/settings/webhooks/index.blade.php modified: resources/views/shelves/index.blade.php modified: resources/views/shelves/parts/form.blade.php modified: resources/views/shelves/parts/list.blade.php modified: resources/views/shelves/permissions.blade.php modified: resources/views/shelves/show.blade.php modified: resources/views/tags/index.blade.php deleted: resources/views/tags/parts/table-row.blade.php modified: resources/views/users/api-tokens/parts/list.blade.php modified: resources/views/users/index.blade.php modified: resources/views/users/parts/form.blade.php modified: routes/api.php modified: routes/web.php modified: tests/Actions/AuditLogTest.php modified: tests/Actions/WebhookCallTest.php modified: tests/Actions/WebhookFormatTesting.php modified: tests/Api/AttachmentsApiTest.php modified: tests/Api/BooksApiTest.php modified: tests/Api/ChaptersApiTest.php modified: tests/Api/PagesApiTest.php modified: tests/Api/RecycleBinApiTest.php modified: tests/Api/SearchApiTest.php modified: tests/Api/UsersApiTest.php modified: tests/Auth/AuthTest.php modified: tests/Auth/OidcTest.php modified: tests/Auth/Saml2Test.php modified: tests/Auth/UserInviteTest.php modified: tests/Commands/ClearActivityCommandTest.php modified: tests/Commands/CopyShelfPermissionsCommandTest.php modified: tests/Commands/RegenerateReferencesCommandTest.php modified: tests/Commands/UpdateUrlCommandTest.php modified: tests/Entity/BookShelfTest.php modified: tests/Entity/BookTest.php modified: tests/Entity/ChapterTest.php modified: tests/Entity/CommentSettingTest.php modified: tests/Entity/CommentTest.php modified: tests/Entity/ConvertTest.php modified: tests/Entity/EntityAccessTest.php modified: tests/Entity/EntitySearchTest.php modified: tests/Entity/ExportTest.php modified: tests/Entity/PageContentTest.php modified: tests/Entity/PageDraftTest.php modified: tests/Entity/PageEditorTest.php modified: tests/Entity/PageRevisionTest.php modified: tests/Entity/PageTemplateTest.php modified: tests/Entity/PageTest.php modified: tests/Entity/SortTest.php modified: tests/Entity/TagTest.php modified: tests/ErrorTest.php modified: tests/FavouriteTest.php modified: tests/HomepageTest.php modified: tests/OpenGraphTest.php modified: tests/Permissions/EntityOwnerChangeTest.php modified: tests/Permissions/EntityPermissionsTest.php modified: tests/Permissions/ExportPermissionsTest.php modified: tests/Permissions/RolesTest.php modified: tests/PublicActionTest.php modified: tests/Settings/RecycleBinTest.php modified: tests/TestCase.php modified: tests/ThemeTest.php modified: tests/Uploads/AttachmentTest.php modified: tests/Uploads/ImageTest.php modified: tests/Uploads/UsesImages.php modified: tests/UrlTest.php modified: tests/User/UserManagementTest.php modified: tests/User/UserPreferencesTest.php modified: tests/User/UserProfileTest.php modified: version Untracked files: (use "git add <file>..." to include in what will be committed) .github/workflows/analyse-php.yml .github/workflows/lint-php.yml .github/workflows/test-php.yml app/Actions/Queries/ app/Api/ApiEntityListFormatter.php app/Auth/Permissions/PermissionFormData.php app/Auth/Queries/RolesAllPaginatedAndSorted.php app/Auth/Queries/UsersAllPaginatedAndSorted.php app/Http/Controllers/Auth/ThrottlesLogins.php app/Http/Controllers/PermissionsController.php app/Http/Controllers/UserPreferencesController.php app/Providers/ValidationRuleServiceProvider.php app/Providers/ViewTweaksServiceProvider.php app/Settings/UserShortcutMap.php app/Util/SimpleListOptions.php database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php database/migrations/2022_10_08_104202_drop_entity_restricted_field.php dev/docs/development.md dev/docs/javascript-code.md dev/docs/release-process.md phpcs.xml resources/icons/groups.svg resources/icons/role.svg resources/icons/shortcuts.svg resources/js/components/auto-submit.js resources/js/components/component.js resources/js/components/entity-permissions.js resources/js/components/global-search.js resources/js/components/pointer.js resources/js/components/setting-homepage-control.js resources/js/components/shortcut-input.js resources/js/components/shortcuts.js resources/js/markdown/ resources/js/services/components.js resources/js/services/keyboard-navigation.js resources/js/services/text.js resources/js/wysiwyg/icons.js resources/lang/ar/preferences.php resources/lang/bg/preferences.php resources/lang/bs/preferences.php resources/lang/ca/preferences.php resources/lang/cs/preferences.php resources/lang/cy/preferences.php resources/lang/da/preferences.php resources/lang/de/preferences.php resources/lang/de_informal/preferences.php resources/lang/el/ resources/lang/en/preferences.php resources/lang/es/preferences.php resources/lang/es_AR/preferences.php resources/lang/et/preferences.php resources/lang/eu/preferences.php resources/lang/fa/preferences.php resources/lang/fr/preferences.php resources/lang/he/preferences.php resources/lang/hr/preferences.php resources/lang/hu/preferences.php resources/lang/id/preferences.php resources/lang/it/preferences.php resources/lang/ja/preferences.php resources/lang/ka/ resources/lang/ko/preferences.php resources/lang/lt/preferences.php resources/lang/lv/preferences.php resources/lang/nb/preferences.php resources/lang/nl/preferences.php resources/lang/pl/preferences.php resources/lang/pt/preferences.php resources/lang/pt_BR/preferences.php resources/lang/ru/preferences.php resources/lang/sk/preferences.php resources/lang/sl/preferences.php resources/lang/sv/preferences.php resources/lang/tr/preferences.php resources/lang/uk/preferences.php resources/lang/uz/preferences.php resources/lang/vi/preferences.php resources/lang/zh_CN/preferences.php resources/lang/zh_TW/preferences.php resources/sass/_opacity.scss resources/views/auth/parts/login-message.blade.php resources/views/auth/parts/register-message.blade.php resources/views/auth/register-confirm-accept.blade.php resources/views/common/sort.blade.php resources/views/common/status-indicator.blade.php resources/views/form/entity-permissions-row.blade.php resources/views/pages/parts/revisions-index-row.blade.php resources/views/search/parts/entity-selector-list.blade.php resources/views/search/parts/entity-suggestion-list.blade.php resources/views/settings/recycle-bin/parts/recycle-bin-list-item.blade.php resources/views/settings/roles/parts/asset-permissions-row.blade.php resources/views/settings/roles/parts/related-asset-permissions-row.blade.php resources/views/settings/roles/parts/roles-list-item.blade.php resources/views/settings/webhooks/parts/webhooks-list-item.blade.php resources/views/tags/parts/tags-list-item.blade.php resources/views/users/parts/users-list-item.blade.php resources/views/users/preferences/ tests/Auth/RegistrationTest.php tests/Auth/ResetPasswordTest.php tests/Helpers/EntityProvider.php tests/Helpers/TestServiceProvider.php no changes added to commit (use "git add" and/or "git commit -a") Sorry is there a possibility to make such text block collapsable?
OVERLORD commented 2026-02-05 06:27:44 +03:00
Author
Owner
Copy Link

@ssddanbrown commented on GitHub (Dec 7, 2022):

Depends on the directory and the login user you want to use for updates and stuff.
Here's my general approach to permissions: https://gist.github.com/ssddanbrown/f0e6e850e57c419c6541dbe6c8facd4b

@ssddanbrown commented on GitHub (Dec 7, 2022): Depends on the directory and the login user you want to use for updates and stuff. Here's my general approach to permissions: https://gist.github.com/ssddanbrown/f0e6e850e57c419c6541dbe6c8facd4b
OVERLORD commented 2026-02-05 06:27:45 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 7, 2022):

Here you can see the difference form two folders of the resources/lang directory ro and de for example

adm-bookstack@xxxxxxxxx :/var/www/bookstack$ ls -la resources/lang/ro
total 112
drwxr-xr-x 2 adm-bookstack root 4096 Sep 14 07:32 .
drwxr-xr-x 45 adm-bookstack www-data 4096 Dec 7 15:12 ..
-rw-r--r-- 1 root root 3440 Sep 14 07:32 activities.php
-rw-r--r-- 1 root root 8832 Sep 14 07:32 auth.php
-rw-r--r-- 1 root root 3416 Sep 14 07:32 common.php
-rw-r--r-- 1 root root 1441 Sep 14 07:32 components.php
-rw-r--r-- 1 root root 6684 Sep 14 07:32 editor.php
-rw-r--r-- 1 root root 22870 Sep 14 07:32 entities.php
-rw-r--r-- 1 root root 7883 Sep 14 07:32 errors.php
-rw-r--r-- 1 root root 239 Sep 14 07:32 pagination.php
-rw-r--r-- 1 root root 619 Sep 14 07:32 passwords.php
-rw-r--r-- 1 root root 23953 Sep 14 07:32 settings.php
-rw-r--r-- 1 root root 7310 Sep 14 07:32 validation.php
adm-bookstack@xxxxxxxx :/var/www/bookstack$ ls -la resources/lang/de
total 128
drwxr-xr-x 2 adm-bookstack www-data 4096 Dec 7 15:12 .
drwxr-xr-x 45 adm-bookstack www-data 4096 Dec 7 15:12 ..
-rw-rw-r-- 1 adm-bookstack adm-bookstack 3608 Dec 7 15:12 activities.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 9173 Dec 7 15:12 auth.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 3487 Dec 7 15:12 common.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 1420 Dec 7 15:12 components.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 6841 Dec 7 15:12 editor.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 24754 Dec 7 15:12 entities.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 8607 Dec 7 15:12 errors.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 241 Aug 18 07:22 pagination.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 680 Aug 18 07:22 passwords.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 1046 Dec 7 15:12 preferences.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 25580 Dec 7 15:12 settings.php
-rw-rw-r-- 1 adm-bookstack adm-bookstack 6994 Dec 7 15:12 validation.php

As you can see the owner and group is root in ro-folder since in de-folder ist adm-bookstack what it should be I think. Actually I don't know how this could happened.

@helson22 commented on GitHub (Dec 7, 2022): Here you can see the difference form two folders of the resources/lang directory ro and de for example adm-bookstack@xxxxxxxxx :/var/www/bookstack$ ls -la resources/lang/ro total 112 drwxr-xr-x 2 adm-bookstack root 4096 Sep 14 07:32 . drwxr-xr-x 45 adm-bookstack www-data 4096 Dec 7 15:12 .. -rw-r--r-- 1 root root 3440 Sep 14 07:32 activities.php -rw-r--r-- 1 root root 8832 Sep 14 07:32 auth.php -rw-r--r-- 1 root root 3416 Sep 14 07:32 common.php -rw-r--r-- 1 root root 1441 Sep 14 07:32 components.php -rw-r--r-- 1 root root 6684 Sep 14 07:32 editor.php -rw-r--r-- 1 root root 22870 Sep 14 07:32 entities.php -rw-r--r-- 1 root root 7883 Sep 14 07:32 errors.php -rw-r--r-- 1 root root 239 Sep 14 07:32 pagination.php -rw-r--r-- 1 root root 619 Sep 14 07:32 passwords.php -rw-r--r-- 1 root root 23953 Sep 14 07:32 settings.php -rw-r--r-- 1 root root 7310 Sep 14 07:32 validation.php adm-bookstack@xxxxxxxx :/var/www/bookstack$ ls -la resources/lang/de total 128 drwxr-xr-x 2 adm-bookstack www-data 4096 Dec 7 15:12 . drwxr-xr-x 45 adm-bookstack www-data 4096 Dec 7 15:12 .. -rw-rw-r-- 1 adm-bookstack adm-bookstack 3608 Dec 7 15:12 activities.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 9173 Dec 7 15:12 auth.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 3487 Dec 7 15:12 common.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 1420 Dec 7 15:12 components.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 6841 Dec 7 15:12 editor.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 24754 Dec 7 15:12 entities.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 8607 Dec 7 15:12 errors.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 241 Aug 18 07:22 pagination.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 680 Aug 18 07:22 passwords.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 1046 Dec 7 15:12 preferences.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 25580 Dec 7 15:12 settings.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 6994 Dec 7 15:12 validation.php As you can see the owner and group is root in ro-folder since in de-folder ist adm-bookstack what it should be I think. Actually I don't know how this could happened.
OVERLORD commented 2026-02-05 06:27:53 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 7, 2022):

Hello again,

I set permissions, owner and groups as suggested.

Still getting git error.

I also get the white page when I try accessing bookstack in browser. Even if I rename the messy Folder and copy the whole Bookstack Folder from Backup to /var/www/bookstack

Not so funny now :-(

I have made backup from the whole bookstack directory as mentioned above an a phpmyadmin mysql backup.

Is there a cleaner way without trying around with th messy installation? Should I reinstall? How?

Thank you in advance!

@helson22 commented on GitHub (Dec 7, 2022): Hello again, I set permissions, owner and groups as suggested. Still getting git error. I also get the white page when I try accessing bookstack in browser. Even if I rename the messy Folder and copy the whole Bookstack Folder from Backup to /var/www/bookstack Not so funny now :-( I have made backup from the whole bookstack directory as mentioned above an a phpmyadmin mysql backup. Is there a cleaner way without trying around with th messy installation? Should I reinstall? How? Thank you in advance!
OVERLORD commented 2026-02-05 06:27:56 +03:00
Author
Owner
Copy Link

@ssddanbrown commented on GitHub (Dec 7, 2022):

I'm not clear what is currently messy.
What git error are you getting?

@ssddanbrown commented on GitHub (Dec 7, 2022): I'm not clear what is currently messy. What git error are you getting?
OVERLORD commented 2026-02-05 06:28:03 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 7, 2022):

I'm sorry.

The git pull command aborts and throws error (https://github.com/BookStackApp/BookStack/issues/3862#issuecomment-1341032767)

I "compressed" the output above an post it here again, would be easier for you I think.

error: Your local changes to the following files would be overwritten by merge:
.github/translators.txt
.github/workflows/test-migrations.yml
LICENSE
app/Actions/TagRepo.php
....
....
resources/lang/zh_CN/preferences.php
resources/lang/zh_TW/preferences.php
resources/sass/_opacity.scss
resources/views/auth/parts/login-message.blade.php
resou
Aborting

in the middle of the huge list above following shows up:
error: The following untracked working tree files would be overwritten by merge:
....
....
...

I don't know if this is ok or not - I guess not.

git status says:

On branch release
Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)

Changes not staged for commit:
(use "git add/rm ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: .github/translators.txt
deleted: .github/workflows/phpstan.yml
deleted: .github/workflows/phpunit.yml
...
...
modified: tests/User/UserPreferencesTest.php
modified: tests/User/UserProfileTest.php
modified: version

Untracked files:
(use "git add ..." to include in what will be committed)
.github/workflows/analyse-php.yml
.github/workflows/lint-php.yml
.github/workflows/test-php.yml
app/Actions/Queries/
....
...
....
tests/Auth/ResetPasswordTest.php
tests/Helpers/EntityProvider.php
tests/Helpers/TestServiceProvider.php

no changes added to commit (use "git add" and/or "git commit -a")

@helson22 commented on GitHub (Dec 7, 2022): I'm sorry. The git pull command aborts and throws error (https://github.com/BookStackApp/BookStack/issues/3862#issuecomment-1341032767) I "compressed" the output above an post it here again, would be easier for you I think. error: Your local changes to the following files would be overwritten by merge: .github/translators.txt .github/workflows/test-migrations.yml LICENSE app/Actions/TagRepo.php .... .... resources/lang/zh_CN/preferences.php resources/lang/zh_TW/preferences.php resources/sass/_opacity.scss resources/views/auth/parts/login-message.blade.php resou Aborting in the middle of the huge list above following shows up: error: The following untracked working tree files would be overwritten by merge: .... .... ... I don't know if this is ok or not - I guess not. `git status `says: On branch release Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add/rm ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: .github/translators.txt deleted: .github/workflows/phpstan.yml deleted: .github/workflows/phpunit.yml ... ... modified: tests/User/UserPreferencesTest.php modified: tests/User/UserProfileTest.php modified: version Untracked files: (use "git add ..." to include in what will be committed) .github/workflows/analyse-php.yml .github/workflows/lint-php.yml .github/workflows/test-php.yml app/Actions/Queries/ .... ... .... tests/Auth/ResetPasswordTest.php tests/Helpers/EntityProvider.php tests/Helpers/TestServiceProvider.php no changes added to commit (use "git add" and/or "git commit -a")
OVERLORD commented 2026-02-05 06:28:07 +03:00
Author
Owner
Copy Link

@ssddanbrown commented on GitHub (Dec 7, 2022):

Okay, you're still not at a clean state for some reason.
Ideally we first, before attempting an update, need to be in a position where running git status does not list any files.

  1. Re-run git reset --hard.
  2. Run git clean -f then run git clean -f -d.
  3. Run git status. If there are any files/folders listed stop here and report back the output.
  4. Otherwise, attempt the git pull origin release first update command and report back the output.
  5. Check git status again. Stop and report back the output if any files are listed.
  6. If no files are listed, continue with the two other update commands, stopping and reporting any errors that occur.
@ssddanbrown commented on GitHub (Dec 7, 2022): Okay, you're still not at a clean state for some reason. Ideally we first, before attempting an update, need to be in a position where running `git status` does not list any files. 1. Re-run `git reset --hard`. 2. Run `git clean -f` then run `git clean -f -d`. 3. Run `git status`. If there are any files/folders listed stop here and report back the output. 4. Otherwise, attempt the `git pull origin release` first update command and report back the output. 5. Check `git status` again. Stop and report back the output if any files are listed. 6. If no files are listed, continue with the two other update commands, stopping and reporting any errors that occur.
OVERLORD commented 2026-02-05 06:28:12 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 8, 2022):

Hi again,

done till number 5 with no errors I think. This time I attached a TXT with all the output. For me it looks good.

git_clean.txt

If it looks good for you too I can proceed, I guess? Or have I missed something?

@helson22 commented on GitHub (Dec 8, 2022): Hi again, done till number 5 with no errors I think. This time I attached a TXT with all the output. For me it looks good. [git_clean.txt](https://github.com/BookStackApp/BookStack/files/10184148/git_clean.txt) If it looks good for you too I can proceed, I guess? Or have I missed something?
OVERLORD commented 2026-02-05 06:28:13 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 13, 2022):

I had a second look at the output.

Is this normal behaviour, that some of the entries seem not completed?
f.e. rename resources/views/{entities => common}/sort.blade.php (52%)

There are a few that show no 100%.

Is this severe?

@helson22 commented on GitHub (Dec 13, 2022): I had a second look at the output. Is this normal behaviour, that some of the entries seem not completed? f.e. rename resources/views/{entities => common}/sort.blade.php (52%) There are a few that show no 100%. Is this severe?
OVERLORD commented 2026-02-05 06:28:18 +03:00
Author
Owner
Copy Link

@helson22 commented on GitHub (Dec 15, 2022):

Hello Dan,

I figured out that the precentage is a GIT similarity index.

That's why I tried to continue the update procedure and it worked!

Thank you very, very much for your help! - Keep up the good work! :-)

BR
helson

@helson22 commented on GitHub (Dec 15, 2022): Hello Dan, I figured out that the precentage is a GIT similarity index. That's why I tried to continue the update procedure and it worked! **Thank you very, very much for your help! - Keep up the good work! :-)** BR helson
OVERLORD commented 2026-02-05 06:28:22 +03:00
Author
Owner
Copy Link

@ssddanbrown commented on GitHub (Dec 15, 2022):

Ah, apologies, I forgot to respond to the above.
Good to hear things are now working! I'll therefore close this off.
Remember to take a backup/snapshot now while things are working and in a clean state!

@ssddanbrown commented on GitHub (Dec 15, 2022): Ah, apologies, I forgot to respond to the above. Good to hear things are now working! I'll therefore close this off. Remember to take a backup/snapshot now while things are working and in a clean state!
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
🎨 Design
📖 Docs Update
🐛 Bug
🐛 Bug
:cat2:🐈 Possible duplicate
💿 Database
☕ Open to discussion
💻 Front-End
🐕 Support
🚪 Authentication
🌍 Translations
🔌 API Task
🏭 Back-End
⛲ Upstream
🔨 Feature Request
🛠️ Enhancement
🛠️ Enhancement
🛠️ Enhancement
❤️ Happy feedback
🔒 Security
🔍 Pending Validation
💆 UX
📝 WYSIWYG Editor
🌔 Out of scope
🔩 API Request
:octocat: Admin/Meta
🖌️ View Customization
❓ Question
🚀 Priority
🛡️ Blocked
🚚 Export System
♿ A11y
🔧 Maintenance
> Markdown Editor
pull-request
Mirrored from GitHub Pull Request
No Label 🐕 Support
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/BookStack#3354
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?