Commit Graph

842 Commits (40ba1bd246fefaec87ec79d8d0df48c9a614592b)
 

Author SHA1 Message Date
Sikander Saleem 40ba1bd246 ui improvements 5 days ago
Sikander Saleem e38892ff2d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/insurance/insurance_home_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
5 days ago
Haroon6138 838929591a Merge pull request 'haroon_dev' (#162) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/162
5 days ago
haroon amjad 5feacfaf27 Translation updates 5 days ago
haroon amjad 39af08ddc3 Translation updates 7 days ago
Haroon6138 f026ae1d62 Merge pull request 'haroon_dev' (#161) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/161
1 week ago
haroon amjad e5f24b9c06 updates 1 week ago
haroon amjad 00475dc100 Merge branch 'master' into haroon_dev 1 week ago
Haroon6138 23b92cef41 Merge pull request 'dev_sultan' (#160) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/160
1 week ago
haroon amjad 3ff9628cd3 Translation updates 1 week ago
Sultan khan 7d8537fae6 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 week ago
Sultan khan 1edeff439e notifications page updates 1 week ago
Haroon6138 a1beacc36e Merge pull request 'haroon_dev' (#159) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/159
1 week ago
haroon amjad 3e6ee8c10c Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/routes/app_routes.dart
1 week ago
haroon amjad 87422e8e05 translation updates 1 week ago
Sikander Saleem 0b9df1f22b collapsing toolbar behaviour changed as like barq 1 week ago
Haroon6138 179b86b2b0 Merge pull request 'fatima' (#158) from fatima into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/158
1 week ago
Fatimah.Alshammari f6aa1fc7ac Merge branch 'refs/heads/master' into fatima 1 week ago
Fatimah.Alshammari 9795276ef9 fixed errors 1 week ago
Sikander Saleem 45b013a048 UI/UX improvements - insurance update. 1 week ago
Sikander Saleem 1599cfed4e UI/UX improvements-1. 1 week ago
haroon amjad 96ccb40f36 Merge branch 'master' into haroon_dev 1 week ago
Haroon6138 bb7c05493a Merge pull request 'fatima' (#157) from fatima into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/157
1 week ago
haroon amjad 169215fd7b translation changes 1 week ago
Fatimah.Alshammari 97a47ce4e8 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
1 week ago
Fatimah.Alshammari 287e2b9562 fixed QR 1 week ago
Sikander Saleem 77a04e637e UI/UX improvements. 1 week ago
Sultan khan 8b5c4d7575 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/dependencies.dart
#	lib/routes/app_routes.dart
1 week ago
Sultan khan 8c92df8648 contact us page fix 1 week ago
haroon amjad 8f428297cb Arabic translations added 1 week ago
Haroon6138 e9d3b3680a Merge pull request 'haroon_dev' (#156) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/156
1 week ago
haroon amjad a0008c9104 Nearest Appointment sorting fixed 1 week ago
Fatimah.Alshammari 1d224702ac Merge branch 'refs/heads/master' into fatima 1 week ago
Fatimah.Alshammari 69666a6f6c fixed button 1 week ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 1 week ago
Haroon6138 06c67a0409 Merge pull request 'dev_aamir' (#153) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/153
1 week ago
Haroon6138 d1b1bbf777 Merge pull request 'dev_sultan' (#154) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/154
1 week ago
Sultan khan 0ddaa6899d Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  fixed parking qr
  added parking part
  added monthly report
  added monthly report
  added monthly report
  fix error
  monthly report
  fix toggle
  fix toggle
  active medication
  active medication
  active medication
1 week ago
Sultan khan 42222804fd fix graph dot and bp graph. 1 week ago
aamir-csol bf210e664d Merge branch 'master' into dev_aamir 2 weeks ago
aamir-csol 6725ab028d doctor search filter design update & switch user bug fix. 2 weeks ago
haroon amjad 609ae6ab83 updates 2 weeks ago
haroon amjad 344adf23c0 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
2 weeks ago
haroon amjad 44ce353dac updates 2 weeks ago
Haroon6138 b5753769b7 Merge pull request 'fatima' (#152) from fatima into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/152
2 weeks ago
Fatimah.Alshammari 250af1506c Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/services/dialog_service.dart
#	lib/theme/colors.dart
2 weeks ago
haroon amjad fc750174fe Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad d848291930 updates 2 weeks ago
Haroon6138 aee496b7c3 Merge pull request 'dev_sultan' (#151) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/151
2 weeks ago
Sultan khan 16da0f4d0a Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 2 weeks ago