Conflict resolved
This commit is contained in:
@@ -395,4 +395,12 @@
|
||||
<column name="country" value="Italy"/>
|
||||
</insert>
|
||||
</changeSet>
|
||||
<changeSet id="23-08-2024_1" author="Harish Bagora">
|
||||
<addColumn tableName="gepafin_user">
|
||||
<column name="reset_password_token" type="VARCHAR(255)">
|
||||
<constraints nullable="true"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
|
||||
@@ -65,6 +65,20 @@ evaluation.criteria.created.successfully=EvaluationCriteria created successfully
|
||||
evaluation.criteria.fetch.successfully=EvaluationCriteria fetched successfully.
|
||||
evaluation.criteria.updated.successfully=EvaluationCriteria updated successfully.
|
||||
evaluation.criteria.deleted.successfully=EvaluationCriteria deleted successfully.
|
||||
# Password reset messages
|
||||
password.reset.initiated=Password reset initiated.
|
||||
password.reset.success=Password has been successfully reset.
|
||||
#Change Password
|
||||
invalid.token.msg=The token provided is invalid or expired. Please request a new token.
|
||||
current.password.incorrect = Current password is incorrect.
|
||||
success.password.changed=Password changed successfully.
|
||||
#Logout
|
||||
logout.successful.msg=Logout successful. You have been logged out successfully.
|
||||
#Update user Active or Deactive status
|
||||
update.user.status.success=User status has been successfully updated.
|
||||
|
||||
|
||||
|
||||
|
||||
#Faq-related messages
|
||||
faq.not.found=Faq not found.
|
||||
|
||||
@@ -81,4 +81,14 @@ lookupdata.deleted.successfully=LookUpData eliminato correttamente.
|
||||
|
||||
#Document-related message
|
||||
document.updated.successfully=Documento aggiornato con successo.
|
||||
document.fetched.successfully=Documento recuperato con successo.
|
||||
document.fetched.successfully=Documento recuperato con successo.
|
||||
# Password reset messages
|
||||
password.reset.initiated=Reimpostazione della password avviata.
|
||||
password.reset.success=La password <20> stata reimpostata con successo.
|
||||
invalid.token.msg=Il token fornito <20> invalido o scaduto. Si prega di richiedere un nuovo token.
|
||||
current.password.incorrect = La password attuale non <20> corretta.
|
||||
success.password.changed=Password cambiata con successo.
|
||||
logout.successful.msg=Logout riuscito. Sei stato disconnesso con successo.
|
||||
|
||||
update.user.status.success=Lo stato dell'utente <20> stato aggiornato con successo.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user