Commit Graph

257 Commits (833ccc9ff121f97e9ea76978379bb465c1f4f2bd)

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
3 months ago
tahaalam a8138ba231 Merge remote-tracking branch 'origin/master' into reminer 3 months ago
tahaalam 8b829b9101 reminder start time added to the prescription 3 months ago
aamir-csol f1555c76a3 Invoices Filter 3 months ago
haroon amjad 1709b80e84 Updates 3 months ago
haroon amjad 4a3d66f01a Updates 3 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 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
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 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 f46b3f745f Dark mode enabled 3 months ago
Fatimah.Alshammari ee358259f5 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
4 months ago
Fatimah.Alshammari 8368dbd4d9 fixed Ar and En files 4 months ago
haroon amjad dffed5df6b Insurance approvals page fixes 4 months ago
Fatimah.Alshammari cf3c14281c fixed Ar En files 4 months ago
tahaalam 3f9046f1e4 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart
4 months ago
Fatimah.Alshammari 46c8fbf0f6 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
4 months ago
haroon amjad 9413e54d3a NPHIES Eligibility checks implemented 4 months ago
haroon amjad ec506869cc Android package name updated to new package details 4 months ago
haroon amjad 05b6d02e4c Updates & fixes 4 months ago
haroon amjad 8309f311e6 App update page implemented 4 months ago
haroon amjad 4b710523e8 Feedback status implemented 4 months ago
haroon amjad e1788f1187 Merge branch 'master' into haroon_dev 4 months ago
faizatflutter b44ae1e838 added women support in symptoms checker module. 4 months ago
haroon amjad 2be65cba51 Inactive Insurance case handled 4 months ago
haroon amjad 530b87282f updates & fixes 4 months ago
haroon amjad 2e1f4e87e0 AI Lab Analysis updates 4 months ago
haroon amjad 5015747580 LiveCare changes 4 months ago
haroon amjad 01c21377aa Updates & fixes 4 months ago
tahaalam 183bcce003 merge issue resolution 4 months ago
tahaalam 02398d3bb4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
4 months ago
tahaalam d137e1166d watch integration ui added. 4 months ago
aamir-csol a105d87241 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
4 months ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 4 months ago
haroon amjad c9279e2272 updates 4 months ago
Fatimah.Alshammari 47ec43850d Merge branch 'master' into fatima 4 months ago
haroon amjad 3c9c3032a5 Services price list implemented 4 months ago
haroon amjad 2ab3e178a2 Indoor navigation implemented 4 months ago
haroon amjad 3af43dc676 JIRA bug fixes & updates 4 months ago