Commit Graph

476 Commits (dev_aamir)
 

Author SHA1 Message Date
haroon amjad b1af9e1779 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad a711d3a6dd LiveCare shcedule implementation contd. 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
haroon amjad 3e95999bf3 Merge branch 'master' into haroon_dev 1 month ago
aamir-csol f9bfc131a8 family screen & widgets 1 month ago
Haroon Amjad 1c2564a1e2 updates 1 month ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 1 month ago
Sultan khan 28eae0e68e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
aamir-csol a79dcad221 family screen & widgets 1 month ago
aamir-csol fd98ed6fc3 Merge remote-tracking branch 'refs/remotes/origin/dev_sultan' into dev_aamir 1 month ago
Sultan khan e7c62a3321 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
Sultan khan 4d52987c83 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
Sultan khan 5ce7548656 family file work-in-progress 1 month ago
Haroon6138 fdfdbd25b2 Merge pull request 'dev_aamir' (#50) from dev_aamir into master
Reviewed-on: #50
1 month ago
aamir-csol 8240d3e78d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/authentication/register_step2.dart
1 month ago
Haroon Amjad a4854bbe4a Habib Wallet updates 1 month ago
Haroon6138 25f0b9d415 Merge pull request 'haroon_dev' (#49) from haroon_dev into master
Reviewed-on: #49
1 month ago
Haroon Amjad bdde6c224d Merge branch 'master' into haroon_dev 1 month ago
Haroon6138 2c405aa0c3 Merge pull request 'ui improvement.' (#47) from dev_sikander into master
Reviewed-on: #47
1 month ago
Haroon6138 5e82e02323 Merge pull request 'Location functionality' (#48) from functionality/location into master
Reviewed-on: #48
1 month ago
Haroon Amjad c9206f1ab8 Radiology report implemented 1 month ago