Commit Graph

54 Commits (f508d441e2b74f1ab0a5d81d2d55eff1a512b249)

Author SHA1 Message Date
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
8 months ago
haroon amjad 5e1a7652be lab report download implemented 8 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 8 months ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 8 months ago
haroon amjad b27e3268b1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
8 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 8 months 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
8 months ago
aamir-csol d918b6e464 family screen & widgets 8 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 8 months ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 8 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 8 months ago
haroon amjad 903248133e Lab order & results enhancements 8 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 8 months ago
haroon amjad db979977ca Tamara implementation & enhancements 8 months ago
tahaalam 36bf229787 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
8 months ago
tahaalam 42abf9ca1b login bypass removed 8 months ago
haroon amjad 1d22e53f63 Merge branch 'master' into haroon_dev
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
tahaalam da89c41925 lab result by hospital and translations are added 9 months ago
haroon amjad 093e645f60 request medical report implementation completed. 9 months ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
9 months ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 9 months ago
faizatflutter 94313b8870 Improved Error Handling 9 months ago
haroon amjad a07369165d Updates 9 months ago
haroon amjad a711d3a6dd LiveCare shcedule implementation contd. 9 months ago
haroon amjad 97038f1a25 advance payment implementation done for self & other file number 9 months ago
Haroon Amjad 1c2564a1e2 updates 9 months ago
Haroon Amjad a4854bbe4a Habib Wallet updates 9 months ago
Haroon Amjad c9206f1ab8 Radiology report implemented 9 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 9 months ago
haroon amjad ccd29f0cf9 updates 9 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 9 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 9 months ago
haroon amjad 542de41a82 updates & fixes 9 months ago
haroon amjad 2d0fc11f05 updates 9 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
9 months ago
aamir-csol 484ab56a8e fixes for signup 9 months ago
Sultan khan 384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart
9 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 9 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 9 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 9 months ago
aamir-csol 52fddc5323 login flow completion 9 months ago
faizatflutter 84804a59a7 completed till otp receiving 9 months ago
faizatflutter 3e50a3c89d Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart
9 months ago
faizatflutter 6e05ca15cf adding the login function 9 months ago
Haroon Amjad f5e655fd35 Lab order API implemented 10 months ago
Haroon Amjad a77fc49c68 lab result changes 10 months ago
haroon amjad e044fc8c5e lab implementation contd. 10 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 10 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 10 months ago
faizatflutter c1221e4970 pushed device api 10 months ago