Commit Graph

141 Commits (f812dac059c21f4a72cc586dbcea1cf7c83e59ae)

Author SHA1 Message Date
haroon amjad f812dac059 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
9 months ago
haroon amjad 4269e99be9 updates 9 months ago
Haroon6138 4cdcf495ea Merge pull request 'dev_sultan' (#24) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/24
9 months ago
Sikander Saleem 118c6717b1 report and logout actions button added. 9 months ago
Sultan khan 138862b115 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan 299c0b0e29 login flow complete 9 months ago
haroon amjad 8df38ea6d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/extensions/widget_extensions.dart
9 months ago
haroon amjad 01b6ab0e4b habib wallet implementation contd. 9 months ago
haroon amjad ccd29f0cf9 updates 9 months ago
Sikander Saleem 09e92b8649 Merge branch 'refs/heads/master' into dev_sikander 9 months ago
Sikander Saleem 50c3a8e595 collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading 9 months ago
Sultan khan 58d33e2dae Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
9 months ago
Sultan khan 1466b6b71a no message 9 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 9 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
Haroon6138 0e76e95636 Merge pull request 'dev_sultan' (#20) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/20
9 months ago
Sultan khan 2a081e30b5 saved login done. 9 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 9 months ago
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
9 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 9 months ago
Sultan khan 9f0fb27baf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
Sultan khan b4667f5c94 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
9 months ago
aamir-csol ffb399c704 fixes for signup 9 months ago
Sultan khan 075578602e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
9 months ago
Sultan khan a199ca040b quick login inprogress 9 months ago
aamir-csol 9b063ba764 fixes for signup 9 months ago
Sikander Saleem 7cc12bd1cf prescription calender reminder added. 9 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 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. 10 months ago
Haroon Amjad 003a161b52 custom chips implemented 10 months ago
haroon amjad f8be788a60 updates & fixes 10 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
10 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 10 months ago
haroon amjad 542de41a82 updates & fixes 10 months ago
haroon amjad 2d0fc11f05 updates 10 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
10 months ago
aamir-csol 484ab56a8e fixes for signup 10 months ago
Sultan khan 7d5b941df3 merged conflict 10 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
10 months ago
Sultan khan ba2c8327fe login flow inprogress 10 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 10 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 10 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 10 months ago
Sultan khan 61d10068ca Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
aamir-csol 4e1912048d login flow completion 10 months ago
aamir-csol 52fddc5323 login flow completion 10 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
10 months ago
Sultan khan ac17202b7a search lab order updated. 10 months ago