Commit Graph

1021 Commits (151fcf23d1e84acf17c4c0e0830e4a0a3e81f546)
 

Author SHA1 Message Date
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
Haroon6138 ff75531f26 Merge pull request 'haroon_dev' (#196) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/196
2 weeks ago
haroon amjad 114e9e7929 Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad 47b50e35a1 updates 2 weeks ago
haroon amjad 29447cc9fa updates 2 weeks ago
haroon amjad 5b04a5a3ea lab test description update 2 weeks ago
Haroon6138 cdbba6f270 Merge pull request 'haroon_dev' (#195) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/195
2 weeks ago
haroon amjad 6e71aa7f13 updates & fixes 2 weeks ago
haroon amjad fdeeed10d6 updates 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
haroon amjad 074c060e36 Updates & fixes 3 weeks ago
haroon amjad b4a7508f7c updates 3 weeks ago
haroon amjad 961a1f5b03 updates 3 weeks ago
haroon amjad 68ff91561f Merge branch 'master' into haroon_dev 3 weeks ago
haroon amjad 631fabad23 updates 3 weeks ago
Haroon6138 7b2e3a5a54 Merge pull request 'calender package added' (#194) from calender_pacakge_changes into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/194
3 weeks ago
tahaalam 71ac91a076 calender package added 3 weeks ago
Haroon6138 558381b797 Merge pull request 'haroon_dev' (#192) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/192
3 weeks ago
haroon amjad f5aa12a04b Android zoom fixes 3 weeks ago
haroon amjad b75f0c7ee4 updates 3 weeks ago
haroon amjad 79b23584db updates 4 weeks ago
haroon amjad 295709cbc2 Merge branch 'master' into haroon_dev 4 weeks ago
haroon amjad 1286455f8c wallet page fix 4 weeks ago
Haroon6138 8878558f12 Merge pull request 'fatima' (#191) from fatima into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/191
4 weeks ago
haroon amjad 5e16169867 updates 4 weeks ago
Fatimah.Alshammari ee358259f5 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
4 weeks ago
Fatimah.Alshammari 8368dbd4d9 fixed Ar and En files 4 weeks ago
Haroon6138 faf00b88ef Merge pull request 'haroon_dev' (#190) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/190
1 month ago
haroon amjad cf27430e29 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad dffed5df6b Insurance approvals page fixes 1 month ago
Fatimah.Alshammari cf3c14281c fixed Ar En files 1 month ago
Haroon Amjad d9013a1dc2 Added immediate patient insurance update API 1 month ago
haroon amjad a25df34f42 updates 1 month ago
haroon amjad 6cc058e86d updates 1 month ago
tahaalam fbe9cd9dff package change activity 1 month ago
haroon amjad 84224ae61b sickleave & medical report fixes 1 month ago
tahaalam 7100283a9d package change activity 1 month 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 b334f631bd samsung sdk health aar 1 month ago
tahaalam a395d9b93a ios health connect added 1 month ago
Haroon Amjad c2028841c5 test description issue in lab results fixed 1 month ago
tahaalam bfeb3dce4e data integration along with the data representation 1 month ago
haroon amjad dc0e4e5eb6 Updates & fixes, Filter issues fixed for lab & rad 1 month ago
Fatimah.Alshammari 46c8fbf0f6 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
1 month ago
Haroon6138 658b77aa37 Merge pull request 'haroon_dev' (#188) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/188
1 month ago
haroon amjad 2a819a2d97 Ancillary order fixes 1 month ago
haroon amjad 9413e54d3a NPHIES Eligibility checks implemented 1 month ago
Haroon Amjad 105ab2326a updates 1 month ago