Commit Graph

864 Commits (78a6d55b35d809b4a2451b357ea3278bcb2c94ed)

Author SHA1 Message Date
haroon amjad 78a6d55b35 Merge branch 'master' into watch_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
19 hours ago
tahaalam a8138ba231 Merge remote-tracking branch 'origin/master' into reminer 1 day ago
tahaalam 8b829b9101 reminder start time added to the prescription 1 day ago
Haroon6138 88da9af44b Merge pull request 'Invoices Filter' (#200) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/200
1 day ago
aamir-csol f1555c76a3 Invoices Filter 1 day ago
tahaalam 2babda2d63 Merge remote-tracking branch 'origin/master' into labs_graph_pdf 2 days ago
haroon amjad d4ed2b47bc updates 2 days ago
tahaalam 1d1c756412 graph values fix and comparision with the pdf 2 days ago
haroon amjad 1709b80e84 Updates 2 days ago
haroon amjad 4a3d66f01a Updates 3 days ago
haroon amjad 0ed6103b15 updates 3 days ago
haroon amjad d053f58b7d Updates 6 days ago
haroon amjad d703c382e5 Updates 1 week ago
haroon amjad 3d877ed28d Updates 1 week ago
Haroon Amjad 55b8bc162c Updates 2 weeks ago
haroon amjad 08928ddd28 Habib Wallet updates 2 weeks ago
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
2 weeks ago
Haroon Amjad 657f886391 Changes for AI Lab analysis 3 weeks ago
Haroon Amjad 30bdfac442 App update page updates 3 weeks ago
Haroon Amjad d194b5a45b updates 3 weeks ago
haroon amjad 1a68ffd500 Updates 3 weeks ago
tahaalam 50d78551c2 warning dialog displayed to user if the watch intented is not currently implemented 3 weeks ago
haroon amjad abbf016694 Merge branch 'master' into haroon_dev 3 weeks ago
haroon amjad 2c0d010bac updates 3 weeks ago
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 3 weeks ago
Sultan khan f51e37db55 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:
  updates
  updates
  lab test description update

# Conflicts:
#	lib/core/api/api_client.dart
#	lib/presentation/authentication/login.dart
3 weeks ago
Sultan khan 4f303d8496 other country login done. 3 weeks ago
tahaalam 151fcf23d1 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/build.gradle.kts
#	android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-hdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-mdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxhdpi/ic_launcher.png
#	android/app/src/main2/res/mipmap-xxxhdpi/ic_launcher.png
#	android/build/reports/problems/problems-report.html
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	package/device_calendar_plus/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	pubspec.yaml
3 weeks ago
haroon amjad 47b50e35a1 updates 3 weeks ago
Sultan khan 80adf1bd2f 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:
  updates & fixes
  updates
  updates
  Dark mode persistence added in the app
  Dark mode enabled
  Updates & fixes
  updates
  updates
  updates
3 weeks ago
haroon amjad 29447cc9fa updates 3 weeks ago
haroon amjad 5b04a5a3ea lab test description update 3 weeks ago
haroon amjad 6e71aa7f13 updates & fixes 3 weeks ago
haroon amjad fdeeed10d6 updates 3 weeks ago
Haroon Amjad 8de8039096 updates 4 weeks ago
Haroon Amjad 040ff6a80d Dark mode persistence added in the app 4 weeks ago
haroon amjad f46b3f745f Dark mode enabled 4 weeks ago
Sultan khan acfab432cc multiple submit button commented 4 weeks ago
haroon amjad 074c060e36 Updates & fixes 4 weeks ago
haroon amjad b4a7508f7c updates 4 weeks ago
Sultan khan d6eb6970af 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: (29 commits)
  calender package added
  Android zoom fixes
  updates
  updates
  wallet page fix
  updates
  fixed Ar and En files
  Insurance approvals page fixes
  fixed Ar En files
  Added immediate patient insurance update API
  updates
  sickleave & medical report fixes
  test description issue in lab results fixed
  Updates & fixes, Filter issues fixed for lab & rad
  Ancillary order fixes
  NPHIES Eligibility checks implemented
  updates
  Android package name updated to new package details
  Updates & fixes
  App update page implemented
  ...
4 weeks ago
haroon amjad 961a1f5b03 updates 1 month ago
haroon amjad 68ff91561f Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 631fabad23 updates 1 month ago
tahaalam 71ac91a076 calender package added 1 month ago
haroon amjad b75f0c7ee4 updates 1 month ago
haroon amjad 79b23584db updates 1 month ago
haroon amjad 295709cbc2 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 1286455f8c wallet page fix 1 month ago
haroon amjad 5e16169867 updates 1 month ago