Commit Graph

52 Commits (9aadb37a2bdc01ebeee1944c86cefedf7c6f85d1)

Author SHA1 Message Date
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. 9 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 9 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 9 months ago
haroon amjad 4c241b0dac Lab orders implemented 9 months ago
Sultan khan fe8c1120a8 assets added 9 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
9 months ago
Sultan khan f55d82ddb3 bottom navigation 9 months ago
Haroon Amjad 36c6f0d541 Landing page updates 9 months ago
aamir-csol 7321da67e3 register step 2 & fixes 9 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
9 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
aamir-csol 4e3ba99280 widgets & fixes 10 months ago