Commit Graph

206 Commits (4e17ff9c82bdae62396c12897b0e686c32d452a5)
 

Author SHA1 Message Date
Sultan khan 61d10068ca Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 2 months ago
aamir-csol 4e1912048d login flow completion 2 months ago
aamir-csol 52fddc5323 login flow completion 2 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
2 months ago
Sultan khan ac17202b7a search lab order updated. 2 months ago
Haroon Amjad 43fa08b8b6 insurance update update 2 months ago
haroon amjad d794787459 updates 2 months ago
Haroon6138 e4792ca5a0 Merge pull request 'faiz_dev1' (#12) from faiz_dev1 into master
Reviewed-on: #12
2 months ago
faizatflutter b15ddd1713 completed till otp receiving 2 months ago
faizatflutter 36c41d40f8 Merge branch 'master' into faiz_dev 2 months ago
haroon amjad bafeb68950 medical file changes 2 months ago
faizatflutter 26f0ffda2c completed till otp receiving 2 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
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
haroon amjad 2d5f2b1deb updates 2 months ago
Haroon6138 6d282d9899 Merge pull request 'dev_sikander' (#11) from dev_sikander into master
Reviewed-on: #11
2 months ago
Sikander Saleem 0db18c789c Merge branch 'refs/heads/master' into dev_sikander 2 months ago
Sikander Saleem d385d0362f merge changes 2 months ago
faizatflutter 923f7d7781 completed till otp receiving 2 months ago
faizatflutter 84804a59a7 completed till otp receiving 2 months ago
Haroon6138 1fcfc488fa Merge pull request 'dev_sultan' (#10) from dev_sultan into master
Reviewed-on: #10
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
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
2 months ago
Haroon6138 24b98626d2 Merge pull request 'dev_aamir' (#8) from dev_aamir into master
Reviewed-on: #8
2 months ago
aamir-csol c27d7301d9 calender & signup fixes. 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 333b813f90 bottom sheet 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
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 2 months ago
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 2 months ago
Sikander Saleem 38d37fd407 custom tab bar 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
aamir-csol 0309299f44 changes 2 months ago
faizatflutter 6e05ca15cf adding the login function 2 months ago
Haroon Amjad e8f8f6074c prescription details updates 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 cd61d08d49 Merge branch 'dev_sultan' 2 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 2 months ago
Sultan khan 886825a4b9 bottom navigation updated. 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