SaveFamily/sf-app-platform
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

auth-recover-password #11

Closed
aitorarana wants to merge 0 commits from auth-recover-password into develop
pull from: auth-recover-password
merge into: SaveFamily:develop
Conversation 0 Commits - Files Changed - +1613 -865
aitorarana commented 2025-12-19 11:44:39 +00:00
Member
Copy Link
No description provided.
aitorarana added 3 commits 2025-12-19 11:44:39 +00:00
added login and 2fa login endpoints, providers and states 076951af24
Merge remote-tracking branch 'origin/auth-login-and-2fa-login' into auth-recover-password efbdae81d4 
# Conflicts:
#	modules/auth/lib/src/core/data/datasource/auth_remote_datasource.dart
#	modules/auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart
#	modules/auth/lib/src/core/data/repositories/auth_repository_impl.dart
#	modules/auth/lib/src/core/domain/repositories/auth_repository.dart
#	modules/auth/lib/src/features/recover_password/presentation/new_password_screen.dart
#	modules/auth/lib/src/features/recover_password/presentation/restore_password_screen.dart
#	packages/design_system/lib/src/inputs/textfields.dart
#	packages/sf_localizations/assets/l10n/de.json
#	packages/sf_localizations/assets/l10n/en.json
#	packages/sf_localizations/assets/l10n/es.json
#	packages/sf_localizations/assets/l10n/fr.json
#	packages/sf_localizations/assets/l10n/it.json
#	packages/sf_localizations/assets/l10n/pt.json
#	packages/sf_localizations/lib/src/generated/i18n.dart
Fix merge conflicts 2c56d9fcb2
aitorarana closed this pull request 2025-12-19 13:09:53 +00:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
aitorarana aitzibersolis alvarsanmartin bea10labs hector ivanmartinez jenkins jonanderelvira jorgebareas julianalcala nataliaexposito palomaibanez Raul unaimartinez
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: SaveFamily/sf-app-platform#11
Delete Branch "auth-recover-password"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?