Merge branch 'dev/new-design-fix-murena' into 'main'

RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch

RUN rm -rf ${TMP_PATCH_DIR}

# show reset pwd page with a query param

RUN cd ${BASE_DIR}/core/js/dist && sed -i 's/resetPassword:!1/resetPassword:!1||re.showResetPassword==="1"/' login.js

# autocomplete leak tweak apps frontend with sed, disable group suggestion

RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/"GROUP","INDIVIDUAL"/"INDIVIDUAL"/g' js/contacts-main.js

--- ./core/templates/layout.guest-new.php	2022-06-09 13:47:41.255340395 +0530

+++ ./core/templates/layout.guest.php	2022-06-16 17:34:38.429775039 +0530

--- ./core/templates/layout.guest.php	2022-09-12 14:16:28.724884600 +0530

+++ ./core/templates/layout.guest-new.php	2022-09-12 14:03:12.924884600 +0530

@@ -20,6 +20,7 @@

 		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">

 		<link rel="manifest" href="<?php print_unescaped(image_path('', 'manifest.json')); ?>">

 					<?php print_unescaped($_['content']); ?>

+					<?php if (array_key_exists("alt_login",$_)) { ?>

+					<div class="have-an-account">

+						<div><?php p($l->t('Don\'t have an account yet?')); ?></div>

+						<div><a href="/signup"><?php p($l->t('Create an account')); ?></a></div>

+						<div class="createaccdesk"><?php p($l->t('Don\'t have an account yet?')); ?> <a href="/signup"><?php p($l->t('Create an account')); ?></a></div>

+						<div class="createaccmob"><p><?php p($l->t('Don\'t have an account yet?')); ?></p> <p> <a href="/signup"><?php p($l->t('Create an account')); ?></a></p></div>

+					</div>

+					<?php } ?>

 				</main>

+

 	</body>

 </html>

\ No newline at end of file