Commit Graph

173 Commits (changes)

Author SHA1 Message Date
tahaalam b93e23a314 Emergency servicews pages changes of passing the values which are displayed outside 7 hours 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
10 hours ago
tahaalam e73d2534cc social media elements added for profile and service page 10 hours ago
Sultan khan dfc2e21e8c no message 10 hours ago
tahaalam 05aaa71cf9 live care changes 11 hours ago
tahaalam cfcbaa85a3 LANGUAGE CHANGES 1 day ago
tahaalam bf9b88e79c map prescriptiojn changes
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
1 day ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 3 days ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
4 days ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 4 days ago
Sultan khan cfea843c4f updates and fixes 4 days ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 4 days ago
tahaalam d97ead4e03 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	lib/core/app_assets.dart
4 days ago
tahaalam fb93aa1092 ambulance call page changes:
1. icon change for the success of ambulance call and rrt.
2. flow changed to first select the appoiintment then hospital.
3. location accorate enabled.
4 days ago
Sultan khan 7e2c470767 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 & fixes
6 days ago
Sultan khan 5f82f0db2d fixes and updates 6 days ago
haroon amjad 86fa198afc Updates & fixes 6 days ago
haroon amjad 408c0c83d9 updates 1 week ago
Sultan khan 21ae30a8cc profile picture upload 1 week ago
Sultan khan 5f559a44dd profile image upload 1 week ago
haroon amjad 5b44329972 updates 1 week ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 1 week ago
haroon amjad 21477f34dc updates 1 week ago
haroon amjad 0eb9ec11d3 remote localization files added 1 week ago
haroon amjad f929bd9017 Updates 1 week ago
haroon amjad a13d0cf0e4 updates 2 weeks ago
haroon amjad 837a934d0d updates 2 weeks 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
2 weeks ago
haroon amjad 1709b80e84 Updates 2 weeks ago
haroon amjad 1a68ffd500 Updates 1 month ago
haroon amjad 2c0d010bac updates 1 month 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
1 month ago
haroon amjad 47b50e35a1 updates 1 month ago
haroon amjad f46b3f745f Dark mode enabled 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
2 months ago
haroon amjad 4b710523e8 Feedback status implemented 2 months ago
faizatflutter b44ae1e838 added women support in symptoms checker module. 2 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
2 months ago
tahaalam d137e1166d watch integration ui added. 2 months ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 2 months ago
Sikander Saleem f376f430c6 Merge branch 'refs/heads/master' into dev_sikander 3 months ago
haroon amjad 4e6d3d3178 SmartWatch implementation contd. 3 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
3 months ago
haroon amjad 20216cd4ae Merge branch 'master' into haroon_dev 3 months ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
3 months ago
aamir-csol 8b701255ed logout & family file fix 3 months ago
haroon amjad 7ead6d79e5 updates 3 months ago
haroon amjad f46f978326 Clinic icons updated 3 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 3 months ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 3 months ago