NOW MANAGED ON CODEBERG
Merge branch 'development' into default-templates
Dan Brown968bc8cdf354
diff --cc app/Entities/Controllers/BookController.phpindex 9d8db27e9,55d28c684..9b938d89a--- a/app/Entities/Controllers/BookController.php+++ b/app/Entities/Controllers/BookController.php@@@ -1,12 -1,12 +1,13 @@@<?php- namespace BookStack\Http\Controllers;+ namespace BookStack\Entities\Controllers;- use BookStack\Actions\ActivityQueries;- use BookStack\Actions\ActivityType;- use BookStack\Actions\View;+ use BookStack\Activity\ActivityQueries;+ use BookStack\Activity\ActivityType;+ use BookStack\Activity\Models\View;+ use BookStack\Activity\Tools\UserEntityWatchOptions;use BookStack\Entities\Models\Bookshelf;+use BookStack\Entities\Models\Page;use BookStack\Entities\Repos\BookRepo;use BookStack\Entities\Tools\BookContents;use BookStack\Entities\Tools\Cloner;diff --cc app/Entities/Controllers/PageController.phpindex 8b131c4f3,4d8c7e809..ad75448b3--- a/app/Entities/Controllers/PageController.php+++ b/app/Entities/Controllers/PageController.php@@@ -1,9 -1,10 +1,11 @@@<?php- namespace BookStack\Http\Controllers;+ namespace BookStack\Entities\Controllers;- use BookStack\Actions\View;+ use BookStack\Activity\Models\View;+ use BookStack\Activity\Tools\CommentTree;+ use BookStack\Activity\Tools\UserEntityWatchOptions;+use BookStack\Entities\Models\Book;use BookStack\Entities\Models\Page;use BookStack\Entities\Repos\PageRepo;use BookStack\Entities\Tools\BookContents;