Merge branch 'develop'

sillsdev · Sep 21, 2023 · 22c7c09 · 22c7c09
2 parents 6a3363e + 68d75e5
commit 22c7c09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Api/Model/Shared/UserListModel.php b/src/Api/Model/Shared/UserListModel.php
@@ -10,7 +10,7 @@ public function __construct()
     {
         parent::__construct(
             UserModelMongoMapper::instance(),
-            ["username" => ['$regex' => ""], "isDeleted" => false],
+            ["username" => ['$regex' => ""], "isDeleted" => ['$in' => [false, null]]],
             ["username", "email", "name", "avatar_ref", "role", "projects", "active"]
         );
     }

diff --git a/src/robots.txt b/src/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Allow: /