Commit Graph

794 Commits (1f290c5bfe2c5f663e3f6a514bc7eb2f32b7fa67)

Author SHA1 Message Date
haroon amjad 1f290c5bfe updates 2 months ago
haroon amjad deca29b423 updates & fixes 2 months ago
haroon amjad 93af246700 updates 2 months ago
haroon amjad c18bf9f2c1 Layout fix for appointment details page 2 months ago
haroon amjad f9f2e22376 updates 2 months ago
haroon amjad ac8189fa17 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
haroon amjad e29aba81da Updates 2 months ago
tahaalam a8138ba231 Merge remote-tracking branch 'origin/master' into reminer 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 444e7b562f Merge branch 'master' into haroon_dev 2 months 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
2 months ago
haroon amjad 7611c1d58c Updates 2 months ago
aamir-csol f1555c76a3 Invoices Filter 2 months ago
haroon amjad dfc666673d Profile settings update 2 months ago
tahaalam 2babda2d63 Merge remote-tracking branch 'origin/master' into labs_graph_pdf 2 months ago
haroon amjad d4ed2b47bc updates 2 months ago
tahaalam 1d1c756412 graph values fix and comparision with the pdf 2 months ago
haroon amjad 1709b80e84 Updates 2 months ago
haroon amjad 4a3d66f01a Updates 2 months ago
haroon amjad 0ed6103b15 updates 2 months ago
haroon amjad d053f58b7d Updates 3 months ago
haroon amjad d703c382e5 Updates 3 months ago
haroon amjad 3d877ed28d 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 30bdfac442 App update page updates 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