From: Dan Brown <redacted>
Date: Mon, 11 Dec 2023 11:41:43 +0000 (+0000)
Subject: Merge branch 'development' into default-templates
X-Git-Tag: v23.12~1^2~9^2~7
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/968bc8cdf354d9cbe29b88abdc747a7845031fab

Merge branch 'development' into default-templates
---

968bc8cdf354d9cbe29b88abdc747a7845031fab
diff --cc app/Entities/Controllers/BookController.php
index 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.php
index 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;