Commit Graph

142 Commits (17c47d093c844c6c38e56c5c153ab60b6f96d366)

Author SHA1 Message Date
Haroon Amjad 43fa08b8b6 insurance update update 2 months ago
haroon amjad d794787459 updates 2 months ago
faizatflutter b15ddd1713 completed till otp receiving 2 months ago
faizatflutter 26f0ffda2c completed till otp receiving 2 months ago
faizatflutter db50bd8f23 Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart
2 months ago
faizatflutter 923f7d7781 completed till otp receiving 2 months ago
faizatflutter 84804a59a7 completed till otp receiving 2 months ago
Sultan khan 3cafc16d50 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
2 months ago
Haroon6138 24b98626d2 Merge pull request 'dev_aamir' (#8) from dev_aamir into master
Reviewed-on: #8
2 months ago
Sultan khan 29aae34726 lab search added 2 months ago
haroon amjad 2f9fbaef7a insurance update implementation contd. 2 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
2 months ago
aamir-csol 3855ba276f calender & signup fixes. 2 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
2 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 2 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 2 months ago
haroon amjad efb22aec4e prescription details page implemented 2 months ago
aamir-csol e41ffd583d changes 2 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
2 months ago
faizatflutter 6e05ca15cf adding the login function 2 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
2 months ago
aamir-csol 85fac13314 changes 2 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 2 months ago
faizatflutter 32fadb8ad9 completed login function 2 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 2 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 2 months ago
haroon amjad 4c241b0dac Lab orders implemented 2 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
2 months ago
Haroon Amjad f5e655fd35 Lab order API implemented 2 months ago
Haroon Amjad a77fc49c68 lab result changes 2 months ago
haroon amjad e044fc8c5e lab implementation contd. 2 months ago
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 months ago
faizatflutter 572fcef0f1 checkUserAuth 2 months ago
aamir-csol d1e1154bdb changes 2 months ago
faizatflutter c6a95fe7d7 latest push after master merged 2 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 2 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 2 months ago
Sultan khan 4e010bb2cf initial commit 2 months ago
Sultan khan d3aff9f93d updating structure 2 months ago
faizatflutter 45e868adba pushed new API 2 months ago
Faiz Hashmi 357cf4392e Updated architecture 2 months ago
Faiz Hashmi d65dc4ea89 initial commit 2 months ago