Merge pull request #859 from DefGuard/dev

merge dev -> main (1.1.0)
DefGuard · Nov 20, 2024 · 2b3ebdb · 2b3ebdb
2 parents f9ac573 + 3944f50
commit 2b3ebdb
Show file tree

Hide file tree

Showing 114 changed files with 1,842 additions and 2,133 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -5,28 +5,28 @@
 
 ### 🛠️ Dev Branch Merge Checklist:
 
-#### Documentation ###
+#### Documentation
 
-- [ ] If testing requires changes in the environment or deployment, please **update the documentation** (https://defguard.gitbook.io) first and **attach the link to the documentation** section in this pool request
+- [ ] If testing requires changes in the environment or deployment, please **update the documentation** (https://docs.defguard.net/) first and **attach the link to the documentation** section in this pool request
 - [ ] I have commented on my code, particularly in hard-to-understand areas
 
-#### Testing ### 
+#### Testing
 
 - [ ] I have prepared end-to-end tests for all new functionalities
 - [ ] I have performed end-to-end tests manually and they work
 - [ ] New and existing unit tests pass locally with my changes
 
-#### Deployment ###
+#### Deployment
 
 - [ ] If deployment is affected I have made corresponding/required changes to [deployment](https://github.com/defguard/deployment) (Docker, Kubernetes, one-line install)
 
 ### 🏚️ Main Branch Merge Checklist:
 
-#### Testing ### 
+#### Testing
 
 - [ ] I have merged my changes before to dev and the dev checklist is done
 - [ ] I have tested all functionalities on the dev instance and they work
 
-#### Documentation ###
+#### Documentation
 
 - [ ] I have made corresponding changes to the **user & admin documentation** and added new features documentation with screenshots for users/admins
diff --git a/...9cdc53103547d3d273803313bc091c72c323.json → ...c7e64b747ea250e6e27a5177f89116cb4775.json b/...9cdc53103547d3d273803313bc091c72c323.json → ...c7e64b747ea250e6e27a5177f89116cb4775.json
diff --git a/.sqlx/query-18caaf9ec8c752b1ed530f8fb2991c51a3af0d260bf8e726c1c54966e11a9711.json b/.sqlx/query-18caaf9ec8c752b1ed530f8fb2991c51a3af0d260bf8e726c1c54966e11a9711.json
diff --git a/...818f346d9d25547aedd4dc388347b7620cfd.json → ...95ecb9c0fcb8762c25aa960e7b5a2e49963b.json b/...818f346d9d25547aedd4dc388347b7620cfd.json → ...95ecb9c0fcb8762c25aa960e7b5a2e49963b.json
diff --git a/.sqlx/query-1feeccc3729029c40d9cbecd21919fc184af94f52cb135c4c8bd2830c92a47db.json b/.sqlx/query-1feeccc3729029c40d9cbecd21919fc184af94f52cb135c4c8bd2830c92a47db.json
diff --git a/...627ef6f053bcb59d81e41dd1cf1bd199b543.json → ...2c0315892c7d2c012c7cc4c399410189814b.json b/...627ef6f053bcb59d81e41dd1cf1bd199b543.json → ...2c0315892c7d2c012c7cc4c399410189814b.json
diff --git a/...a7b39b9389ae01437b7d9405ffa074388279.json → ...d798082c152c7c629190b6c6edd3f113c544.json b/...a7b39b9389ae01437b7d9405ffa074388279.json → ...d798082c152c7c629190b6c6edd3f113c544.json
diff --git a/...696bb16daaece311438358321c8e8ea3b65f.json → ...b8a0a34a7376b86242814bda2f8e004d1589.json b/...696bb16daaece311438358321c8e8ea3b65f.json → ...b8a0a34a7376b86242814bda2f8e004d1589.json
diff --git a/...76674eef0d3848f3805778291df5d4fa3537.json → ...f8698c283d3158c7b6806a24d777819c7e64.json b/...76674eef0d3848f3805778291df5d4fa3537.json → ...f8698c283d3158c7b6806a24d777819c7e64.json
diff --git a/...88bf5eeef60689d104448989726a5999eb42.json → ...6304eab840ddfce68b9c3950683b3951ba7f.json b/...88bf5eeef60689d104448989726a5999eb42.json → ...6304eab840ddfce68b9c3950683b3951ba7f.json
diff --git a/...4de34b7c3ca8bd5e48ed9f313d20cbe8f8e4.json → ...00053846b927c80463b3fd836ea0af11cf07.json b/...4de34b7c3ca8bd5e48ed9f313d20cbe8f8e4.json → ...00053846b927c80463b3fd836ea0af11cf07.json
diff --git a/...ca6caf4a42bb9ad01d6f44db41a572abce95.json → ...601bc4b08439d2516802d06dfd5da3692fd3.json b/...ca6caf4a42bb9ad01d6f44db41a572abce95.json → ...601bc4b08439d2516802d06dfd5da3692fd3.json
diff --git a/...5626b1ad29755fef9758f88353e786a1b2ed.json → ...89525bfaedcf7f3e025ec9fc80ae734681e0.json b/...5626b1ad29755fef9758f88353e786a1b2ed.json → ...89525bfaedcf7f3e025ec9fc80ae734681e0.json
diff --git a/...a71cbb3019f86f5d69e186efba7f0fabd4d1.json → ...748410f91dd5775508cf403b88eabf26c515.json b/...a71cbb3019f86f5d69e186efba7f0fabd4d1.json → ...748410f91dd5775508cf403b88eabf26c515.json
diff --git a/.sqlx/query-c4e2279ae22667242ddab424cb35d81d565b02d86af3e2a8eabc08f9ca2cbfbb.json b/.sqlx/query-c4e2279ae22667242ddab424cb35d81d565b02d86af3e2a8eabc08f9ca2cbfbb.json