Feat: reset password #47
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # symfony/composer.lock
# Conflicts: # symfony/config/packages/security.yaml
# Conflicts: # .gitignore # symfony/src/Entity/Trait/ValidateableEntity.php # symfony/src/Entity/User/User.php # symfony/src/Entity/User/UserLike.php # symfony/src/Security/Voter/ActorVoter.php # symfony/src/Services/Serializer/UserContextBuilder.php # symfony/src/Services/State/Provider/CurrentUserProvider.php
# Conflicts: # .gitignore # symfony/src/Security/Voter/ActorVoter.php # symfony/src/Services/Serializer/UserContextBuilder.php # symfony/src/Services/State/Provider/CurrentUserProvider.php
… into feat/reset-password
…rbaine-cameroun into feat/reset-password
plduthoit
requested changes
Dec 18, 2024
There was a problem hiding this comment.
Je pense que c'est bon. Il y avait quelques conflits avec main. J'ai du remettre la branche a jour avec main, vu qu'il y avait 18000 changements..
J'ai essayé résoudre les conflits. Les fichiers de trad étaient tout remis en ordre alphabétiques, un peu l'horreur pour résoudre les conflits.
Du coup peux être a surveiller si tes trads sont toujours là.. Et vérifier que la page Mon compte s'affiche bien.
De mon côté j'arrive pas à tester la fonctionnalité en local.
J'ai un
Connection could not be established with host "localhost:25": stream_socket_client(): Unable to connect to localhost:25 (Connection refused)
Des trucs à ajuster ? des trucs a mettre dans un .env
Sinon pour le reste des micros commentaires, mais ça m'a l'air bon 👌
|
J'ai ajouter la config par défaut pour le mailer... Ca devrait être bon maintenant ;-) |
# Conflicts: # vue/src/assets/translations/fr/admin.json # vue/src/assets/translations/fr/common.json # vue/src/assets/translations/fr/resources.json # vue/src/views/member/MemberView.vue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.