Commit Graph

154 Commits (9a93e2ea1a62ccbf6d937dd7dc40d6bd0aed0a6c)

Author SHA1 Message Date
haroon amjad e427e91b2f Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/symptoms_checker/triage_screen.dart
1 month ago
haroon amjad 98450b4f94 Appointment parking QR implemented 1 month ago
faizatflutter 6efbe257d1 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/authentication/register_step2.dart
1 month ago
faizatflutter 897bd30879 Refund Module Completed 1 month ago
Aamir Muhammad 2b53cce0aa Merge branch 'refs/heads/master' into offers_discounts
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
1 month ago
Aamir Muhammad 7cd1d84ff6 Image Functionality & Discounts & Offers 1 month ago
faizatflutter 64da8f1804 Merge branch 'master' into faiz_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/dependencies.dart
#	lib/features/habib_wallet/habib_wallet_view_model.dart
#	lib/generated/locale_keys.g.dart
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
faizatflutter 198280fbde Refund Request and Withdraw Module In Progress! 2 months ago
Haroon Amjad 9ead2cacaf updates & fixes 2 months ago
haroon amjad 40a0ecdda4 Lakum integration contd. 2 months ago
Sultan khan 95223b44e9 no message 2 months ago
Sultan khan 7654dbb4f6 no message 2 months ago
aamir-csol fdf21b725e Zoom in and Out 2 months ago
tahaalam fb64d3b957 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
2 months ago
tahaalam e73d2534cc social media elements added for profile and service page 2 months ago
Sultan khan dfc2e21e8c no message 2 months ago
tahaalam 05aaa71cf9 live care changes 2 months ago
tahaalam cfcbaa85a3 LANGUAGE CHANGES 2 months ago
tahaalam bf9b88e79c map prescriptiojn changes
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
2 months ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 3 months ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 3 months ago
Sultan khan 5f82f0db2d fixes and updates 3 months ago
haroon amjad 408c0c83d9 updates 3 months ago
Sultan khan 21ae30a8cc profile picture upload 3 months ago
Sultan khan 5f559a44dd profile image upload 3 months ago
haroon amjad 5b44329972 updates 3 months ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 3 months ago
haroon amjad 0eb9ec11d3 remote localization files added 3 months ago
haroon amjad f929bd9017 Updates 3 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
3 months ago
haroon amjad 1709b80e84 Updates 3 months ago
haroon amjad 1a68ffd500 Updates 4 months ago
haroon amjad 2c0d010bac updates 4 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
4 months ago
haroon amjad 47b50e35a1 updates 4 months ago
haroon amjad f46b3f745f Dark mode enabled 4 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
4 months ago
haroon amjad 4b710523e8 Feedback status implemented 5 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
5 months ago
tahaalam d137e1166d watch integration ui added. 5 months ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 5 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
5 months ago
haroon amjad 20216cd4ae Merge branch 'master' into haroon_dev 5 months ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
5 months ago
aamir-csol 8b701255ed logout & family file fix 5 months ago
haroon amjad 7ead6d79e5 updates 5 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 5 months ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 5 months ago
faizatflutter 07447e148b Symptoms Checker flow is completed 5 months ago
haroon amjad 99282f34e3 Added language change option in landing page 5 months ago