Commit Graph

153 Commits (f19d06512aae7a8d8ddc2290b8a79f6dfdbeb413)

Author SHA1 Message Date
haroon amjad 3418480122 Immediate LiveCare implementation completed 9 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 9 months ago
tahaalam da89c41925 lab result by hospital and translations are added 9 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 9 months 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
9 months ago
aamir-csol 1335d3a7c8 family screen & widgets 9 months ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 9 months ago
aamir-csol 288a0018ce family screen & widgets 9 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
9 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 9 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 9 months ago
haroon amjad a07369165d Updates 9 months ago
haroon amjad f7e26da6f4 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 9 months ago
Sikander Saleem 604e503e52 flow improvement & translation added. 9 months ago
Sikander Saleem c553876c8a Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Haroon6138 938d95cb06 Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/55
9 months ago
Sultan khan 6d85227f11 lab order by test 9 months ago
taha.alam 7093a26cb8 selection region arabic handling 9 months ago
Sikander Saleem 005157fe5e Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/recharge_wallet_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/splashPage.dart
9 months ago
Sikander Saleem 12cef74f16 splash animation added. 9 months 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
9 months ago
haroon amjad 3e95999bf3 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 9 months ago
aamir-csol a79dcad221 family screen & widgets 9 months ago
aamir-csol 8240d3e78d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/authentication/register_step2.dart
9 months ago
Haroon Amjad c9206f1ab8 Radiology report implemented 9 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 9 months ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 9 months ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 9 months ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem 8f0e910e4f profile and settings ui completed. 9 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 9 months ago
aamir-csol b9b0dfd1fa Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
9 months ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 9 months 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
9 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 9 months ago
Sultan khan b78c78ed8b no message 9 months ago
Sultan khan 6b766e558d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/navigation_screen.dart
9 months 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
9 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 9 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 9 months ago
Sultan khan fdd5d4cf6d fixes 9 months ago
haroon amjad 73f8baa77e Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/extensions/string_extensions.dart
#	lib/widgets/input_widget.dart
9 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
9 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 9 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 9 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 9 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 9 months ago
Haroon Amjad b240293064 medical file implementation contd. 9 months ago
haroon amjad 151351c0bf medical file updates 9 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 9 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
9 months ago
Sikander Saleem f9859036ef ui improvements. 9 months ago
haroon amjad 01b6ab0e4b habib wallet implementation contd. 9 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 9 months ago
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
9 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 9 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem d464721733 merge conflict fixed. 9 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 9 months ago
Sultan khan 8511d0aa65 no message 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
Sultan khan ba2c8327fe login flow inprogress 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
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
9 months ago
Haroon6138 24b98626d2 Merge pull request 'dev_aamir' (#8) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/8
9 months ago
haroon amjad 2f9fbaef7a insurance update implementation contd. 9 months ago
aamir-csol da035650c0 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
9 months ago
haroon amjad cce7c7166d Merge branch 'dev_sultan'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
9 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 9 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 9 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 9 months ago
haroon amjad efb22aec4e prescription details page implemented 9 months ago
aamir-csol 0309299f44 changes 9 months ago
aamir-csol cf1908b44a Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
9 months ago
aamir-csol 85fac13314 changes 9 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 10 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 10 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 10 months ago
haroon amjad 4c241b0dac Lab orders implemented 10 months ago
Sultan khan fe8c1120a8 assets added 10 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
10 months ago
Sultan khan f55d82ddb3 bottom navigation 10 months ago
Haroon Amjad 36c6f0d541 Landing page updates 10 months ago
aamir-csol 7321da67e3 register step 2 & fixes 10 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
10 months ago
haroon amjad e044fc8c5e lab implementation contd. 10 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 10 months ago
haroon amjad 22e9fb738b assets added 10 months ago
aamir-csol 23a4035117 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
#	lib/widgets/buttons/custom_button.dart
10 months ago
aamir-csol 67e580447e changes 10 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 10 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 10 months ago
aamir-csol 6f98690929 register & changes 10 months ago
aamir-csol 9c52a6122f Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/authantication/login.dart
10 months ago
Haroon Amjad 0a39a00df5 Landing page updates 10 months ago
aamir-csol ea15bd9152 bottom sheet 10 months ago