Commit Graph

190 Commits (7c8d7b67a998012f49662ac7cc92b92436eac689)
 

Author SHA1 Message Date
aamir-csol 7c8d7b67a9 signup finalize 2 months ago
aamir-csol b7e19a0af8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 months ago
aamir-csol 0c58c22ea5 sign 2 months ago
Haroon6138 9aadb37a2b Merge pull request 'haroon_dev' (#28) from haroon_dev into master
Reviewed-on: #28
2 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 2 months ago
haroon amjad d87562caf5 updates 2 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 2 months ago
Haroon6138 335d51a04a Merge pull request 'dev_aamir' (#27) from dev_aamir into master
Reviewed-on: #27
2 months ago
aamir-csol 6f011880bd Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart
2 months ago
haroon amjad 9fbb8c3418 updates 2 months ago
aamir-csol 70810fa14c signup completed 2 months ago
aamir-csol 2b18e08e64 signup completed 2 months ago
aamir-csol 8c55064158 signup completed 2 months ago
haroon amjad 41ca0e27d9 updates 2 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
2 months ago
haroon amjad 28da6e0a2c updates 2 months ago
Haroon6138 1df5b3abd9 Merge pull request 'dev_sultan' (#26) from dev_sultan into master
Reviewed-on: #26
2 months ago
Haroon6138 fdf347699f Merge pull request 'dev_sikander' (#25) from dev_sikander into master
Reviewed-on: #25
2 months ago
Sultan khan 301348518d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 2 months ago
Sultan khan a5f64798e0 login fixes 2 months ago
Sikander Saleem c6a5b49af8 Merge branch 'refs/heads/master' into dev_sikander 2 months ago
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
2 months ago
haroon amjad 4269e99be9 updates 2 months ago
Haroon6138 4cdcf495ea Merge pull request 'dev_sultan' (#24) from dev_sultan into master
Reviewed-on: #24
2 months ago
Haroon6138 3ee45b7532 Merge pull request 'dev_sikander' (#23) from dev_sikander into master
Reviewed-on: #23
2 months ago
Sikander Saleem f9859036ef ui improvements. 2 months ago
Sikander Saleem d9097c27a3 Merge branch 'refs/heads/master' into dev_sikander 2 months ago
Sikander Saleem 118c6717b1 report and logout actions button added. 2 months ago
Sultan khan 138862b115 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 2 months ago
Sultan khan 299c0b0e29 login flow complete 2 months ago
haroon amjad 8df38ea6d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/extensions/widget_extensions.dart
2 months ago
Haroon6138 3911a8fd1a Merge pull request 'dev_sikander' (#22) from dev_sikander into master
Reviewed-on: #22
2 months ago
haroon amjad 01b6ab0e4b habib wallet implementation contd. 2 months ago
haroon amjad ccd29f0cf9 updates 2 months ago
Sikander Saleem 09e92b8649 Merge branch 'refs/heads/master' into dev_sikander 2 months ago
Sikander Saleem 50c3a8e595 collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading 2 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
2 months ago
Sultan khan 1466b6b71a no message 2 months ago
aamir-csol 7dcc827721 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 months ago
aamir-csol cd48d83c07 signup 2 months ago
Haroon6138 a786d38d74 Merge pull request 'haroon_dev' (#21) from haroon_dev into master
Reviewed-on: #21
2 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 2 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 months ago
Haroon6138 0e76e95636 Merge pull request 'dev_sultan' (#20) from dev_sultan into master
Reviewed-on: #20
2 months ago
Sultan khan 2a081e30b5 saved login done. 2 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 2 months ago
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
2 months ago
Haroon6138 1b5bae2041 Merge pull request 'dev_sikander' (#19) from dev_sikander into master
Reviewed-on: #19
2 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 2 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
2 months ago