Commit Graph

344 Commits (1335d3a7c8a010c7fb0a00e7087fe4d7fee02c04)
 

Author SHA1 Message Date
aamir-csol 1335d3a7c8 family screen & widgets 1 month ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 1 month ago
aamir-csol 288a0018ce family screen & widgets 1 month ago
Haroon6138 eaee656a74 Merge pull request 'Lab result view along with the listing of items is added' (#61) from feature/lab_result into master
Reviewed-on: #61
1 month ago
tahaalam b05b03a6f6 divider changed 1 month ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 1 month ago
aamir-csol 36193d349c Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/medical_file/medical_file_view_model.dart
1 month ago
aamir-csol 02433e1bef family screen & widgets 1 month ago
Sultan khan e2188b5a69 switch family member with super user 1 month ago
Sultan khan 318441c77f Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
aamir-csol 45a1ce9254 Merge branch 'master' into dev_aamir 1 month ago
Haroon6138 90d6e08fde Merge pull request 'dev_sikander' (#58) from dev_sikander into master
Reviewed-on: #58
1 month ago
Sultan khan 3642523fdf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
1 month ago
Sikander Saleem 7c90d966c1 improvement 1 month ago
Sikander Saleem 434185afa7 Merge branch 'refs/heads/master' into dev_sikander 1 month ago
Sikander Saleem 604e503e52 flow improvement & translation added. 1 month ago
aamir-csol 9e8011c34c family screen & widgets 1 month ago
Sultan khan 3acd549de7 no message 1 month ago
aamir-csol 9b33745a57 Merge branch 'master' into dev_aamir 1 month ago
aamir-csol 47ce5022d3 family screen & widgets 1 month ago
Haroon6138 95258ba17b Merge pull request 'dev_sikander' (#57) from dev_sikander into master
Reviewed-on: #57
1 month ago
Sikander Saleem c553876c8a Merge branch 'refs/heads/master' into dev_sikander 1 month ago
Sikander Saleem 96cc15a441 improvements. 1 month ago
Sikander Saleem c35c38aeb1 onboarding screen added. 1 month ago
aamir-csol 1b652f877d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
1 month ago
Sultan khan d5bd99f525 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
Haroon6138 938d95cb06 Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: #55
1 month ago
Haroon6138 989ea9ab3a Merge pull request 'dev_sultan' (#56) from dev_sultan into master
Reviewed-on: #56
1 month ago
aamir-csol 192d617350 family screen & widgets 1 month ago
aamir-csol e48e98d61b Merge branch 'master' into dev_aamir 1 month ago
Sultan khan 12447cdafb no message 1 month ago
Sultan khan 32c7608c83 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
Sultan khan 6d85227f11 lab order by test 1 month ago
taha.alam 8621a525a2 Merge remote-tracking branch 'origin/master' into feature/search_by_region 1 month ago
taha.alam 7093a26cb8 selection region arabic handling 1 month ago
taha.alam 27a0632d6d directional padding and alignment 1 month ago
Haroon6138 d3978de92e Merge pull request 'functionality/graph' (#54) from functionality/graph into master
Reviewed-on: #54
1 month ago
taha.alam 92c3033087 Merge remote-tracking branch 'origin/master' into functionality/graph 1 month ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 1 month ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
Sikander Saleem 005157fe5e Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/recharge_wallet_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/splashPage.dart
1 month ago
aamir-csol 1125437a56 family screen & widgets 1 month ago
Sikander Saleem 12cef74f16 splash animation added. 1 month ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
Haroon6138 4974121061 Merge pull request 'haroon_dev' (#53) from haroon_dev into master
Reviewed-on: #53
1 month ago
haroon amjad 836a72ec22 App directionality changes 1 month ago
haroon amjad ba2785496d Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 97038f1a25 advance payment implementation done for self & other file number 1 month ago
Haroon6138 db880760c3 Merge pull request 'haroon_dev' (#52) from haroon_dev into master
Reviewed-on: #52
1 month ago