 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
|
a8138ba231
|
Merge remote-tracking branch 'origin/master' into reminer
|
7 months ago |
|
tahaalam
|
8b829b9101
|
reminder start time added to the prescription
|
7 months ago |
|
tahaalam
|
2babda2d63
|
Merge remote-tracking branch 'origin/master' into labs_graph_pdf
|
7 months ago |
|
tahaalam
|
1d1c756412
|
graph values fix and comparision with the pdf
|
7 months ago |
|
haroon amjad
|
1709b80e84
|
Updates
|
7 months ago |
|
haroon amjad
|
d053f58b7d
|
Updates
|
7 months ago |
|
haroon amjad
|
3d877ed28d
|
Updates
|
7 months ago |
Haroon Amjad
|
55b8bc162c
|
Updates
|
8 months ago |
|
tahaalam
|
f84d5c6769
|
Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
# lib/splashPage.dart
|
8 months ago |
|
tahaalam
|
dda4dbeba9
|
merge issue resolution some import were missing from master.
|
8 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
|
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
|
47b50e35a1
|
updates
|
8 months ago |
|
haroon amjad
|
29447cc9fa
|
updates
|
8 months ago |
|
haroon amjad
|
6e71aa7f13
|
updates & fixes
|
8 months ago |
|
Haroon Amjad
|
8de8039096
|
updates
|
8 months ago |
|
Haroon Amjad
|
040ff6a80d
|
Dark mode persistence added in the app
|
8 months ago |
|
haroon amjad
|
f46b3f745f
|
Dark mode enabled
|
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
|
9 months ago |
|
tahaalam
|
bfeb3dce4e
|
data integration along with the data representation
|
9 months ago |
|
haroon amjad
|
9413e54d3a
|
NPHIES Eligibility checks implemented
|
9 months ago |
|
Haroon Amjad
|
105ab2326a
|
updates
|
9 months ago |
|
haroon amjad
|
530b87282f
|
updates & fixes
|
9 months ago |
aamir-csol
|
7296bfb6fc
|
family fil fixes
|
9 months ago |
|
haroon amjad
|
01c21377aa
|
Updates & fixes
|
9 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
|
9 months ago |
|
tahaalam
|
d137e1166d
|
watch integration ui added.
|
9 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
|
9 months ago |
|
aamir-csol
|
2c7f4ddc48
|
Ai Analysis & PMA-(1078,1079)
|
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
|
9ed016ad8b
|
updates & fixes
|
9 months ago |
 Sikander Saleem
|
b9350afead
|
ui improvements
|
9 months ago |
faizatflutter
|
9c7cfde5f4
|
ui improvements
|
9 months ago |
|
Sikander Saleem
|
6e1eb0d0bb
|
ui improvements
|
9 months ago |
|
Sikander Saleem
|
6e4d7519fb
|
Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
# lib/presentation/home/widgets/habib_wallet_card.dart
|
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
|
b0708d85d9
|
updates & fixes
|
9 months ago |
|
haroon amjad
|
3e9a381ed7
|
Merge branch 'master' into haroon_dev
|
9 months ago |
|
faizatflutter
|
14f3c6cb81
|
Added Arabic Support for symptoms checker
|
10 months ago |
|
haroon amjad
|
10a5a6f558
|
Ask Doctor implemented
|
10 months ago |
|
haroon amjad
|
f48eb631ab
|
Merge branch 'master' into haroon_dev
|
10 months ago |
|
haroon amjad
|
f54ce71177
|
translation changes
|
10 months ago |
|
faizatflutter
|
07447e148b
|
Symptoms Checker flow is completed
|
10 months ago |
|
haroon amjad
|
6faca94b89
|
updates
|
10 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
|
10 months ago |