Commit Graph

32 Commits (c92cd5c20c47b09f7df4769329d26f862e5451cd)

Author SHA1 Message Date
Sikander Saleem 48de28c0b3 Merge branch 'master' into development_sikander 4 years ago
Fatimah Alshammari 57bf34a93a fix translation. 4 years ago
Fatimah Alshammari 1ef3783fb9 Merge branch 'master' into Fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/profile_api_client.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
#	lib/ui/profile/delete_familyMember.dart
#	lib/ui/profile/family_members.dart
#	lib/ui/profile/phone_numbers.dart
#	lib/ui/screens/profile/profile_screen.dart
4 years ago
Fatimah Alshammari 30ca1894db fix issues. 4 years ago
Sikander Saleem 0b2a87aaaf dynamic forms logic improvement. 4 years ago
Fatimah Alshammari d74d8ff369 fixed footer design. 4 years ago
Fatimah Alshammari 23110b792f completed add and update family member 4 years ago
Sikander Saleem 2f013ba1ad lint rules added. 4 years ago
Sikander Saleem 0786a1fa03 lint rules added. 4 years ago
Fatimah Alshammari a4ca7433a4 add and update family member in progress 4 years ago
Fatimah Alshammari 17ca565f4c Merge branch 'development_sultan' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
 Conflicts:
	lib/api/profile_api_client.dart
4 years ago
Fatimah Alshammari c3945d2583 family member in progress 4 years ago
Sultan Khan ea5178fe20 profle dynamic forms 4 years ago
Sultan Khan f329f7030d Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 4 years ago
Sultan Khan 23326a769a PHONE NUMBERS 4 years ago
Fatimah Alshammari fd07de072c Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
 Conflicts:
	lib/main.dart
	lib/ui/profile/contact_details.dart
4 years ago
Fatimah Alshammari 7be1bdcdc2 fix family member 4 years ago
Sultan Khan 794cd2b1e8 phone number inprogress 4 years ago
Fatimah Alshammari 60db9041a1 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
 Conflicts:
	assets/langs/en-US.json
	lib/ui/profile/contact_details.dart
	lib/ui/profile/personal_info.dart
	pubspec.yaml
4 years ago
Fatimah Alshammari d2a6ed8de7 fix monthly attendance 4 years ago
Sultan Khan 88d2e05ae7 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 4 years ago
Sultan Khan 91a67638c4 phone number inprogress 4 years ago
Sikander Saleem cee80111fc for comment 4 years ago
Sultan Khan 979879a286 phone number is progress 4 years ago
Sikander Saleem c4096bd44d improvements 4 years ago
Sultan Khan 8f80bbb9db profile dynamic forms 4 years ago
Sultan Khan b5a5399b95 profile 4 years ago
Fatimah Alshammari 1305e895a1 fix arabic translation 4 years ago
Sultan Khan f8651ab49a app bar 4 years ago
Fatimah Alshammari 44c9a090f9 fix personal details 4 years ago
Fatimah Alshammari 6529c2aeba profile pages 4 years ago
Fatimah Alshammari 393e28b32c fix profile 4 years ago