Commit Graph

878 Commits (a13d0cf0e4655cb5ca4763079700410b0fd5771d)

Author SHA1 Message Date
haroon amjad a13d0cf0e4 updates 1 day ago
haroon amjad 6108a629a2 Merge branch 'master' into haroon_dev 2 days ago
haroon amjad 837a934d0d updates 2 days ago
Haroon6138 c324007e61 Merge pull request 'family file switch back issue fixed' (#203) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/203
2 days ago
aamir-csol 38471a773c family file switch back issue fixed 2 days ago
haroon amjad fbb2570d8e Vital sign updates 3 days ago
haroon amjad db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
3 days 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
3 days ago
haroon amjad 841fca027c updates 3 days 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
3 days ago
haroon amjad e29aba81da Updates 3 days ago
tahaalam a8138ba231 Merge remote-tracking branch 'origin/master' into reminer 3 days ago
tahaalam 8b829b9101 reminder start time added to the prescription 3 days ago
haroon amjad a45980162d Added location option in region selection bottom sheet 3 days ago
haroon amjad 444e7b562f Merge branch 'master' into haroon_dev 3 days 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
3 days ago
haroon amjad 7611c1d58c Updates 3 days ago
aamir-csol f1555c76a3 Invoices Filter 3 days ago
haroon amjad dfc666673d Profile settings update 4 days ago
tahaalam 2babda2d63 Merge remote-tracking branch 'origin/master' into labs_graph_pdf 4 days ago
haroon amjad d4ed2b47bc updates 4 days ago
tahaalam 1d1c756412 graph values fix and comparision with the pdf 4 days ago
haroon amjad 1709b80e84 Updates 4 days ago
haroon amjad 4a3d66f01a Updates 5 days ago
haroon amjad 0ed6103b15 updates 5 days ago
haroon amjad d053f58b7d Updates 1 week 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 3 weeks ago
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
3 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 4 weeks ago
haroon amjad 6e71aa7f13 updates & fixes 4 weeks ago
haroon amjad fdeeed10d6 updates 4 weeks ago
Haroon Amjad 8de8039096 updates 4 weeks ago
Haroon Amjad 040ff6a80d Dark mode persistence added in the app 4 weeks ago