Commit Graph

1234 Commits (f199fca85969d4054cc7fee4e9f3d60f789e8a2f)
 

Author SHA1 Message Date
Sikander Saleem 7cc12bd1cf prescription calender reminder added. 9 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Haroon6138 2666c2b01d Merge pull request 'haroon_dev' (#18) from haroon_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/18
9 months ago
Sikander Saleem dfe02917fc 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
Haroon Amjad 003a161b52 custom chips implemented 9 months ago
Haroon Amjad 1fe659bf62 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad f8be788a60 updates & fixes 9 months ago
Haroon6138 3c0e555536 Merge pull request 'updates & fixes' (#17) from haroon_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/17
9 months ago
Sikander Saleem 0ce43fde5f Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	assets/images/svg/bell.svg
#	lib/widgets/common_bottom_sheet.dart
9 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 9 months ago
haroon amjad 542de41a82 updates & fixes 9 months ago
haroon amjad 3ef89cdcee Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
haroon amjad 2d0fc11f05 updates 9 months ago
Haroon6138 4730d2cb60 Merge pull request 'no message' (#16) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/16
9 months ago
Sultan khan 8511d0aa65 no message 9 months ago
Haroon6138 757546f0bb Merge pull request 'dev_aamir' (#15) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/15
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
Haroon6138 30d3751052 Merge pull request 'dev_sultan' (#14) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/14
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
Haroon6138 4161a8c6d1 Merge pull request 'haroon_dev' (#13) from haroon_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/13
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
Haroon6138 e4792ca5a0 Merge pull request 'faiz_dev1' (#12) from faiz_dev1 into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/12
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
Haroon6138 6d282d9899 Merge pull request 'dev_sikander' (#11) from dev_sikander into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/11
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
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
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