Commit Graph

112 Commits (c129eb2c2f89b1debdd70e4f4d69cfe835ea9f4a)

Author SHA1 Message Date
aamir-csol c129eb2c2f Merge branch 'master' into dev_aamir 9 months ago
aamir-csol ffb399c704 fixes for signup 9 months ago
aamir-csol 9b063ba764 fixes for signup 9 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 9 months ago
Haroon Amjad 003a161b52 custom chips implemented 9 months ago
haroon amjad f8be788a60 updates & fixes 9 months ago
haroon amjad 542de41a82 updates & fixes 9 months ago
haroon amjad 2d0fc11f05 updates 9 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
9 months ago
aamir-csol 484ab56a8e fixes for signup 9 months ago
Sultan khan 7d5b941df3 merged conflict 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
Sultan khan 61d10068ca Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
aamir-csol 4e1912048d login flow completion 9 months ago
aamir-csol 52fddc5323 login flow completion 9 months ago
Sultan khan 7919d40f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/insurance/insurance_home_page.dart
9 months ago
Sultan khan ac17202b7a search lab order updated. 9 months ago
Haroon Amjad 43fa08b8b6 insurance update update 9 months ago
haroon amjad d794787459 updates 10 months ago
faizatflutter b15ddd1713 completed till otp receiving 10 months ago
faizatflutter 36c41d40f8 Merge branch 'master' into faiz_dev 10 months ago
haroon amjad bafeb68950 medical file changes 10 months ago
faizatflutter 26f0ffda2c completed till otp receiving 10 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
10 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
10 months ago
haroon amjad 2d5f2b1deb updates 10 months ago
Sikander Saleem 0db18c789c Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem d385d0362f merge changes 10 months ago
faizatflutter 923f7d7781 completed till otp receiving 10 months ago
faizatflutter 84804a59a7 completed till otp receiving 10 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
10 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
10 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
10 months ago
aamir-csol c27d7301d9 calender & signup fixes. 10 months ago
Sultan khan 29aae34726 lab search added 10 months ago
haroon amjad 2f9fbaef7a insurance update implementation contd. 10 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
10 months ago
aamir-csol 3855ba276f calender & signup fixes. 10 months ago
haroon amjad 333b813f90 bottom sheet fixes 10 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
10 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 10 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 10 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 10 months ago
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 10 months ago
haroon amjad efb22aec4e prescription details page implemented 10 months ago