Commit Graph

206 Commits (bd85c9368d6cc4c9a94695530ea88d7ac3520513)

Author SHA1 Message Date
haroon amjad 3d39190c62 updates & fixes 7 months ago
haroon amjad 3703afe8bd updates 7 months ago
haroon amjad 93af246700 updates 7 months ago
haroon amjad db89408185 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/generated/locale_keys.g.dart
7 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
7 months ago
haroon amjad 841fca027c updates 7 months ago
tahaalam 8b829b9101 reminder start time added to the prescription 7 months ago
haroon amjad 1709b80e84 Updates 7 months ago
haroon amjad d053f58b7d Updates 7 months ago
tahaalam f84d5c6769 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	lib/splashPage.dart
7 months ago
tahaalam 50d78551c2 warning dialog displayed to user if the watch intented is not currently implemented 8 months ago
Sultan khan 4f303d8496 other country login done. 8 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
8 months ago
Haroon Amjad 8de8039096 updates 8 months ago
haroon amjad f46b3f745f Dark mode enabled 8 months ago
haroon amjad 074c060e36 Updates & fixes 8 months ago
haroon amjad 961a1f5b03 updates 8 months ago
tahaalam 71ac91a076 calender package added 8 months ago
haroon amjad 79b23584db updates 8 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
8 months ago
tahaalam bfeb3dce4e data integration along with the data representation 8 months ago
haroon amjad 9413e54d3a NPHIES Eligibility checks implemented 8 months ago
haroon amjad ec506869cc Android package name updated to new package details 8 months ago
haroon amjad 4b710523e8 Feedback status implemented 8 months ago
haroon amjad 2be65cba51 Inactive Insurance case handled 9 months ago
haroon amjad 5015747580 LiveCare changes 9 months ago
haroon amjad 01c21377aa Updates & fixes 9 months ago
Haroon Amjad a4573c8710 arabic fixes 9 months ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 9 months ago
Haroon Amjad eeaa22357f Date format changed to en-US 9 months ago
haroon amjad f09d478a03 iOS BundleID changes 9 months ago
haroon amjad 3af43dc676 JIRA bug fixes & updates 9 months ago
haroon amjad 85ccf41d04 Updates & fixes for Habib Wallet, Insurance update, Immediate LiveCare 9 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 9 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
9 months ago
haroon amjad f54ce71177 translation changes 9 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
9 months ago
haroon amjad 5feacfaf27 Translation updates 9 months ago
haroon amjad 3ff9628cd3 Translation updates 9 months ago
Sikander Saleem 77a04e637e UI/UX improvements. 9 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
10 months ago
haroon amjad 44ce353dac updates 10 months ago
Fatimah.Alshammari 250af1506c Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/services/dialog_service.dart
#	lib/theme/colors.dart
10 months ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
10 months ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
10 months ago
haroon amjad 1c0842ab95 updates 10 months ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 10 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 10 months ago
Fatimah.Alshammari 20e4f82df3 Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
10 months ago
haroon amjad 685eec6a52 updates & fixes 10 months ago