first merge to main 🚀 #71

Manually merged
philipp merged 491 commits from dev into main 2021-02-19 17:03:06 +00:00
Showing only changes of commit 92fee08dc4 - Show all commits

View File

@ -12,7 +12,7 @@
text: $_('password-reset-in-progress'), text: $_('password-reset-in-progress'),
duration: 3500, duration: 3500,
}).showToast(); }).showToast();
AuthService.authControllerResetPassword(params.resetkey,{ password }) AuthService.authControllerResetPassword(atob(params.resetkey),{ password })
.then((resp) => { .then((resp) => {
Toastify({ Toastify({
text: $_('password-reset-successful'), text: $_('password-reset-successful'),