Commit Graph

539 Commits (aa17688de69d2fda656d67e268952a484fc405df)

Author SHA1 Message Date
aamir-csol aa17688de6 Merge branch 'master' into dev_aamir 2 months ago
haroon amjad 3d39190c62 updates & fixes 2 months ago
haroon amjad 04cbb3db40 no message 2 months ago
haroon amjad f7446d0d41 updates 2 months ago
aamir-csol 2a8f67bba1 family file switch back multi 2 months ago
haroon amjad 3703afe8bd updates 2 months ago
haroon amjad 93af246700 updates 2 months ago
haroon amjad f9f2e22376 updates 2 months ago
haroon amjad 7e73741d08 Bookmark icons added 2 months ago
haroon amjad bd65d05e9e Merge branch 'master' into haroon_dev 2 months ago
haroon amjad a13d0cf0e4 updates 2 months ago
Sultan khan c970a3f697 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
  family file switch back issue fixed
  Vital sign updates
  updates
  Updates
  Added location option in region selection bottom sheet
  Updates
  Profile settings update
2 months ago
Sultan khan 6178062ed0 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: (33 commits)
  reminder start time added to the prescription
  Invoices Filter
  Updates
  updates
  Revert "graph values fix and comparision with the pdf"
  graph values fix and comparision with the pdf
  graph values fix and comparision with the pdf
  Updates
  Updates
  updates
  Updates
  Updates
  Updates
  Updates
  Habib Wallet updates
  Changes for AI Lab analysis
  App update page updates
  updates
  Updates
  warning dialog displayed to user if the watch intented is not currently implemented
  ...

# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 months ago
haroon amjad 837a934d0d updates 2 months ago
Sultan khan d3dfb2e2a5 doctor favorite in progress. 2 months ago
haroon amjad fbb2570d8e Vital sign updates 2 months ago
haroon amjad db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
2 months ago
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
2 months ago
haroon amjad 841fca027c updates 2 months ago
haroon amjad 078b236b67 Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
2 months ago
tahaalam 8b829b9101 reminder start time added to the prescription 2 months ago
haroon amjad a45980162d Added location option in region selection bottom sheet 2 months ago
haroon amjad 1709b80e84 Updates 2 months ago
haroon amjad 4a3d66f01a Updates 2 months ago
haroon amjad d053f58b7d Updates 3 months ago
haroon amjad d703c382e5 Updates 3 months ago
Haroon Amjad 55b8bc162c Updates 3 months ago
haroon amjad 08928ddd28 Habib Wallet updates 3 months ago
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
3 months ago
Haroon Amjad 657f886391 Changes for AI Lab analysis 3 months ago
Haroon Amjad d194b5a45b updates 3 months ago
haroon amjad 1a68ffd500 Updates 3 months ago
tahaalam 50d78551c2 warning dialog displayed to user if the watch intented is not currently implemented 3 months ago
haroon amjad abbf016694 Merge branch 'master' into haroon_dev 3 months ago
haroon amjad 2c0d010bac updates 3 months 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 months ago
Sultan khan 4f303d8496 other country login done. 3 months 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 months ago
haroon amjad 47b50e35a1 updates 3 months ago
haroon amjad 29447cc9fa updates 3 months ago
haroon amjad 6e71aa7f13 updates & fixes 3 months ago
Haroon Amjad 8de8039096 updates 3 months ago
Haroon Amjad 040ff6a80d Dark mode persistence added in the app 3 months ago
haroon amjad f46b3f745f Dark mode enabled 3 months ago
haroon amjad 074c060e36 Updates & fixes 3 months ago
haroon amjad 961a1f5b03 updates 3 months ago
tahaalam 71ac91a076 calender package added 3 months ago
haroon amjad 79b23584db updates 3 months ago
haroon amjad dffed5df6b Insurance approvals page fixes 4 months ago
Haroon Amjad d9013a1dc2 Added immediate patient insurance update API 4 months ago