Commit Graph

33 Commits (107846dd82d024a198ffdadd04414cc25e2ddf81)

Author SHA1 Message Date
haroon amjad a58d4753e4 Merge branch 'sultan-dev' into development_haroon
# Conflicts:
#	assets/langs/en-US.json
#	lib/classes/utils.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
2 years ago
Sikander Saleem 23b4e81170 my documents added. 2 years ago
Sultan khan 790103bdc9 chat changes 2 years ago
haroon amjad d3c5fd1467 Revert "Merge branch 'development_haroon' into 'master'"
This reverts merge request !158
3 years ago
haroon amjad 6436062642 HMG Mohemm Setup 3 years ago
haroon amjad a39e6808d7 fixes & updates 3 years ago
Fatimah Alshammari c83f0c1199 fix issues 3 years ago
haroon amjad c87a00df6a Jira fixes 3 years ago
Fatimah Alshammari 7b4fe5bcbc fix issues 3 years ago
Sikander Saleem 8e94d57dae performance evaluation improvements. 3 years ago
Sultan Khan 39b916bcc8 performance page added 3 years ago
Sultan Khan ff4a546e5f Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan 3c777d220e basic details 3 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
3 years ago
Sultan Khan b10e6184d6 Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Fatimah Alshammari 23110b792f completed add and update family member 3 years ago
Sultan Khan 06b14394bd Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan e6e150b9e3 address phone numbers 3 years ago
Sikander Saleem 0786a1fa03 lint rules added. 3 years ago
Fatimah Alshammari a4ca7433a4 add and update family member in progress 3 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
3 years ago
Fatimah Alshammari c3945d2583 family member in progress 3 years ago
Sultan Khan ea5178fe20 profle dynamic forms 3 years ago
Sultan Khan f329f7030d Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sultan Khan 23326a769a PHONE NUMBERS 3 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
3 years ago
Fatimah Alshammari 7be1bdcdc2 fix family member 3 years ago
Sultan Khan 91a67638c4 phone number inprogress 3 years ago
Sultan Khan 979879a286 phone number is progress 3 years ago
Sultan Khan 8f80bbb9db profile dynamic forms 3 years ago
Sultan Khan b5a5399b95 profile 3 years ago
Fatimah Alshammari 6529c2aeba profile pages 3 years ago
Fatimah Alshammari 393e28b32c fix profile 3 years ago