Commit Graph

337 Commits (f84d5c67692db3124dc07cfbe78d8977426436d8)

Author SHA1 Message Date
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
1 week ago
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 2 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
2 weeks ago
Sultan khan 4f303d8496 other country login done. 2 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
2 weeks ago
haroon amjad 47b50e35a1 updates 2 weeks ago
haroon amjad 29447cc9fa updates 2 weeks ago
haroon amjad 6e71aa7f13 updates & fixes 2 weeks ago
Haroon Amjad 8de8039096 updates 3 weeks ago
Haroon Amjad 040ff6a80d Dark mode persistence added in the app 3 weeks ago
haroon amjad f46b3f745f Dark mode enabled 3 weeks 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
1 month ago
tahaalam bfeb3dce4e data integration along with the data representation 1 month ago
haroon amjad 9413e54d3a NPHIES Eligibility checks implemented 1 month ago
Haroon Amjad 105ab2326a updates 1 month ago
haroon amjad 530b87282f updates & fixes 1 month ago
aamir-csol 7296bfb6fc family fil fixes 1 month ago
haroon amjad 01c21377aa Updates & fixes 1 month 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
1 month ago
tahaalam d137e1166d watch integration ui added. 1 month 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
1 month ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 1 month ago
Haroon Amjad a4573c8710 arabic fixes 2 months ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 2 months ago
haroon amjad 9ed016ad8b updates & fixes 2 months ago
Sikander Saleem b9350afead ui improvements 2 months ago
faizatflutter 9c7cfde5f4 ui improvements 2 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 2 months ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
2 months ago
Sikander Saleem 2648f304f6 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/data/landing_page_data.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
2 months ago
haroon amjad b0708d85d9 updates & fixes 2 months ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 2 months ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 2 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 2 months ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 2 months ago
haroon amjad f54ce71177 translation changes 2 months ago
faizatflutter 07447e148b Symptoms Checker flow is completed 2 months ago
haroon amjad 6faca94b89 updates 2 months ago
Sikander Saleem e38892ff2d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/insurance/insurance_home_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
2 months ago
haroon amjad 5feacfaf27 Translation updates 2 months ago
haroon amjad 39af08ddc3 Translation updates 2 months ago
Sikander Saleem 0b9df1f22b collapsing toolbar behaviour changed as like barq 2 months ago
Sikander Saleem 45b013a048 UI/UX improvements - insurance update. 2 months ago
Sikander Saleem 1599cfed4e UI/UX improvements-1. 2 months ago
Sikander Saleem 77a04e637e UI/UX improvements. 2 months ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 2 months ago
Sultan khan 0ddaa6899d 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:
  fixed parking qr
  added parking part
  added monthly report
  added monthly report
  added monthly report
  fix error
  monthly report
  fix toggle
  fix toggle
  active medication
  active medication
  active medication
2 months ago
Sultan khan 42222804fd fix graph dot and bp graph. 2 months ago
haroon amjad 344adf23c0 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
2 months ago
haroon amjad 44ce353dac updates 2 months ago