Commit Graph

99 Commits (3e5c3a3a273d38c869de9acb65d0168ed6e4ac8c)

Author SHA1 Message Date
aamir-csol 3e5c3a3a27 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 week ago
faizatflutter 8c956fc052 Design changes 1 week ago
aamir-csol 987fe73128 family screen add fixes & remove & switch & widgets 2 weeks ago
faizatflutter 3e61df218b Some Minor design updated 2 weeks ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
3 weeks ago
faizatflutter 462f4eba14 Design Updates 3 weeks ago
faizatflutter eabfaf8182 Design Updates 3 weeks ago
tahaalam d480798053 location dennied forever handled and error builder added to the image network 3 weeks ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 3 weeks ago
aamir-csol aaa8222b1a Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/features/medical_file/medical_file_repo.dart
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
4 weeks ago
aamir-csol d918b6e464 family screen & widgets 4 weeks ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 4 weeks ago
haroon amjad f1a60a9dfb updates 4 weeks ago
tahaalam 61007302c9 appointment date filter handled 4 weeks ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 4 weeks ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 4 weeks ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 1 month ago
aamir-csol e5488299b8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
#	lib/widgets/common_bottom_sheet.dart
1 month ago
haroon amjad 6b28b57307 empty state implementation contd. 1 month ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 1 month ago
haroon amjad a07369165d Updates 1 month ago
aamir-csol 45a1ce9254 Merge branch 'master' into dev_aamir 1 month ago
Sikander Saleem 604e503e52 flow improvement & translation added. 1 month ago
aamir-csol 192d617350 family screen & widgets 1 month ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
aamir-csol 1125437a56 family screen & widgets 1 month ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
aamir-csol f9bfc131a8 family screen & widgets 1 month ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 1 month ago
aamir-csol a79dcad221 family screen & widgets 1 month ago
haroon amjad 3b5d2d27a4 Updates 1 month ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 1 month ago
Haroon6138 bfdc9752ae Merge pull request 'dev_aamir' (#45) from dev_aamir into master
Reviewed-on: #45
1 month ago
Sikander Saleem 57827549b8 language switch added in drawer, and ui improvements 1 month ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 1 month ago
taha.alam 265d979b48 drilled the lat and lng parameter form viewmodel to the mapper 1 month ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 1 month ago
Sikander Saleem c00e69ef0c profile wallet linked with view model. 1 month ago
taha.alam 788887a7f1 Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart
1 month ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 1 month ago
aamir-csol fbd6ef0cf8 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart
2 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 2 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 2 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 2 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 2 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 2 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 2 months ago
aamir-csol 7c8d7b67a9 signup finalize 2 months ago
haroon amjad d87562caf5 updates 2 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 2 months ago