Commit Graph

47 Commits (a30b9872b29ea71c9d719b914d66efd0b02aeecd)

Author SHA1 Message Date
tahaalam ea92a0c75c laser appointment screen added 2 months ago
tahaalam 483a1571d9 Merge remote-tracking branch 'origin/master' into appointment_filter
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
2 months ago
tahaalam 6cf08c04d2 appointment filters added. 2 months ago
tahaalam 641df8b51b logs removed 2 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
2 months ago
tahaalam 6ef9ae813d doctors search filter added 2 months ago
tahaalam da89c41925 lab result by hospital and translations are added 2 months ago
Sikander Saleem 604e503e52 flow improvement & translation added. 2 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
2 months ago
Sultan khan 6d85227f11 lab order by test 2 months ago
taha.alam 7093a26cb8 selection region arabic handling 2 months ago
aamir-csol a79dcad221 family screen & widgets 2 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 2 months ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 2 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 2 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
2 months ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 2 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
2 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 2 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
3 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
3 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 3 months ago
Sultan khan fdd5d4cf6d fixes 3 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 3 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 3 months ago
Sultan khan ba2c8327fe login flow inprogress 3 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
3 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
3 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 3 months ago
haroon amjad efb22aec4e prescription details page implemented 3 months ago
aamir-csol 0309299f44 changes 3 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
3 months ago
aamir-csol 85fac13314 changes 3 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 3 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 3 months ago
haroon amjad 4c241b0dac Lab orders implemented 3 months ago
Sultan khan f55d82ddb3 bottom navigation 3 months ago
Haroon Amjad 36c6f0d541 Landing page updates 3 months ago
aamir-csol 7321da67e3 register step 2 & fixes 3 months ago
aamir-csol 67e580447e changes 3 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 3 months ago
aamir-csol 6f98690929 register & changes 3 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
3 months ago
Haroon Amjad 0a39a00df5 Landing page updates 3 months ago
aamir-csol ea15bd9152 bottom sheet 3 months ago
aamir-csol 4e3ba99280 widgets & fixes 3 months ago
Haroon Amjad b6766654e0 initial commit 3 months ago