Commit Graph

115 Commits (02cd542bd9806b1ee9c9bbb60a6c19d76a65298b)

Author SHA1 Message Date
tahaalam b00a37cabb Merge remote-tracking branch 'origin/master' into live_activities
# Conflicts:
#	android/app/build.gradle.kts
#	android/app/proguard-rules.pro
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/MainActivity.kt
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner/AppDelegate.swift
#	lib/core/cache_consts.dart
#	lib/core/utils/calender_utils_new.dart
#	lib/core/utils/push_notification_handler.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	pubspec.yaml
3 months ago
haroon amjad b793426dd6 Implemented CloudFlare TurnStile 3 months ago
haroon amjad 1a6975fd8a Update to stores VersionID 21.6 3 months ago
haroon amjad 948416da74 Update to stores VersionID 21.4 3 months ago
haroon amjad eafb7aa105 updates 4 months ago
haroon amjad 2e0b853ddc Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	pubspec.yaml
4 months ago
Haroon6138 b43431972a Merge pull request 'feedbacks in symptoms checker (faiz_dev)' (#331) from faiz_dev_symptoms_checker into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/331
4 months ago
faizatflutter fb75e326d2 completed suggested changes 4 months ago
haroon amjad dabbd8557b updates 4 months ago
haroon amjad 4c6485d6af Payfort in-app implementation contd. 4 months ago
faizatflutter c8378278c9 Merge branch 'master' into faiz_dev_symptoms_checker
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
4 months ago
faizatflutter 826d12e57d symptoms checker suggestions from infermedia inprogress 4 months ago
haroon amjad 4eb4d0b37d Parking QR implemented 4 months ago
haroon amjad bcdbfa99ed Fixes & update to stores VersionID 21.3 4 months ago
faizatflutter 6b4ad35217 fixed er 'pickFiles' can't be acc 5 months ago
haroon amjad 0db762fa2c Paytabs implementation contd. 5 months ago
haroon amjad 73066ba21a Update & fixes, App update to stores VersionID 21.2 5 months ago
haroon amjad b6c9fb96d4 Hotfix app update sent to stores, VersionID 21.1, Lakum points implementation contd. 5 months ago
haroon amjad b7d58d9c9d updates 6 months ago
haroon amjad bfdd0fde3c updates 6 months ago
aamir-csol e842d85254 Fixes & Translation 6 months ago
haroon amjad 782cd01b4b updates 6 months ago
haroon amjad bd89a840a0 updates 6 months ago
haroon amjad 04db991851 updates 6 months ago
aamir-csol db2ccd3be6 Date & Time New Widget For Whole App 6 months ago
Sultan khan 5f559a44dd profile image upload 6 months ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 6 months ago
haroon amjad 837a934d0d updates 6 months ago
haroon amjad fbb2570d8e Vital sign updates 6 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
6 months ago
haroon amjad d053f58b7d Updates 7 months ago
Haroon Amjad 55b8bc162c Updates 7 months ago
haroon amjad 1a68ffd500 Updates 7 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
7 months ago
Haroon Amjad 8de8039096 updates 7 months ago
tahaalam 71ac91a076 calender package added 7 months ago
haroon amjad f5aa12a04b Android zoom fixes 7 months ago
haroon amjad b75f0c7ee4 updates 7 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 105ab2326a updates 8 months ago
haroon amjad 8309f311e6 App update page implemented 8 months ago
haroon amjad 530b87282f updates & fixes 8 months ago
haroon amjad 9ed016ad8b updates & fixes 8 months ago
tahaalam 12ec392fc2 revert commented code that were due to zoom issue 8 months ago
tahaalam cd15cf1a39 Merge remote-tracking branch 'origin/master' into live_activities
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/splashPage.dart
#	pubspec.yaml
8 months ago
Haroon Amjad 49542a9112 updates & fixes 9 months ago
Haroon Amjad 1ae1212733 Merge branch 'master' into haroon_dev 9 months ago
Haroon Amjad 537d93915e Zoom SDK fixes 9 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 9 months ago