Commit Graph

85 Commits (db50bd8f2361af6b00c577debf737a6c6ec8452d)
 

Author SHA1 Message Date
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
9 months ago
faizatflutter 923f7d7781 completed till otp receiving 9 months ago
faizatflutter 84804a59a7 completed till otp receiving 9 months ago
Haroon6138 1fcfc488fa Merge pull request 'dev_sultan' (#10) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/10
9 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
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
aamir-csol c27d7301d9 calender & signup fixes. 9 months ago
Sultan khan 29aae34726 lab search added 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
aamir-csol 3855ba276f calender & signup fixes. 9 months ago
haroon amjad 333b813f90 bottom sheet fixes 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
haroon amjad efb22aec4e prescription details page implemented 9 months ago
aamir-csol e41ffd583d changes 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
aamir-csol 0309299f44 changes 9 months ago
faizatflutter 6e05ca15cf adding the login function 9 months ago
Haroon Amjad e8f8f6074c prescription details updates 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 cd61d08d49 Merge branch 'dev_sultan' 10 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 10 months ago
Sultan khan 886825a4b9 bottom navigation updated. 10 months ago
faizatflutter 32fadb8ad9 completed login function 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 0de09dd72c no message 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 97c30874b2 Merge remote-tracking branch 'origin/dev_sultan' into dev_sultan 10 months ago
Sultan khan f55d82ddb3 bottom navigation 10 months ago
Haroon Amjad 36c6f0d541 Landing page updates 10 months ago
Haroon Amjad 2b22e17743 android fixes 10 months ago
aamir-csol 7321da67e3 register step 2 & fixes 10 months ago
Sultan khan d87402ae00 bottom navigation 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 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
haroon amjad 89456bc2aa Medical File Insurance tab content done 10 months ago
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
10 months ago
faizatflutter a0e5aeda05 Merge branch 'master' into faiz_dev1 10 months ago
faizatflutter 572fcef0f1 checkUserAuth 10 months ago
aamir-csol d1e1154bdb changes 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