Merge branch 'main' into 0.22.8Clone

This commit is contained in:
Anthony Stirling
2024-05-05 20:28:25 +01:00
105 changed files with 4592 additions and 1252 deletions

View File

@@ -44,7 +44,7 @@
</th:block>
<!-- Change Username Form -->
<h4 th:text="#{account.changeUsername}">Change Username?</h4>
<form id="bg-card" class="mt-4 mb-4" action="api/v1/user/change-username" method="post">
<form th:if="${!oAuth2Login}" id="bg-card" class="mt-4 mb-4" action="api/v1/user/change-username" method="post">
<div class="mb-3">
<label for="newUsername" th:text="#{account.newUsername}">Change Username</label>
<input type="text" class="form-control" name="newUsername" id="newUsername"
@@ -62,7 +62,7 @@
</form>
<!-- Change Password Form -->
<h4 th:text="#{account.changePassword}">Change Password?</h4>
<h4 th:if="${!oAuth2Login}" th:text="#{account.changePassword}">Change Password?</h4>
<form id="bg-card" class="mt-4 mb-4" action="api/v1/user/change-password" method="post">
<div class="mb-3">
<label for="currentPassword" th:text="#{account.oldPassword}">Old Password</label>
@@ -85,6 +85,7 @@
</div>
</form>
<!-- API Key Form -->
<h4 th:text="#{account.yourApiKey}">API Key</h4>
<div class="card mt-4 mb-4">