Merge branch 'v12/dev' into contrib

2023-06-22 13:11:50 +02:00
parent 4b0e971cf5 8b1e4fa5c2
commit 62f692e617
133 changed files with 2707 additions and 1461 deletions
--- a/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
+++ b/src/Umbraco.Web.UI.Client/src/installer/steps/database.html
@@ -155,6 +155,16 @@
                Use integrated authentication
              </label>
            </div>
+
+            <div class="controls">
+              <label class="checkbox">
+                <input
+                  type="checkbox"
+                  ng-model="installer.current.model.trustServerCertificate"
+                />
+                Trust the database certificate
+              </label>
+            </div>
          </div>
        </div>
      </div>