Commit Graph

36 Commits (9612b0019c40f14d9676b8304a6d327ab1fa2d0b)

Author SHA1 Message Date
tahaalam dda4dbeba9 merge issue resolution some import were missing from master. 3 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
3 months ago
Haroon Amjad 8de8039096 updates 3 months ago
haroon amjad f5aa12a04b Android zoom fixes 4 months ago
tahaalam 7100283a9d package change activity 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
tahaalam b334f631bd samsung sdk health aar 4 months ago
tahaalam bfeb3dce4e data integration along with the data representation 4 months ago
haroon amjad dc0e4e5eb6 Updates & fixes, Filter issues fixed for lab & rad 4 months ago
haroon amjad ec506869cc Android package name updated to new package details 4 months ago
tahaalam 5ea70397e2 samsung integration addded 4 months ago
tahaalam df0b926e59 heart rate sleep data and steps count obtained 4 months ago
tahaalam 4912f686f9 platform channel added. 4 months ago
haroon amjad 2ab3e178a2 Indoor navigation implemented 4 months ago
haroon amjad 44ce353dac updates 5 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 5 months ago
haroon amjad 685eec6a52 updates & fixes 5 months ago
tahaalam 699ef2f672 Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
# Conflicts:
#	android/settings.gradle.kts
5 months ago
tahaalam 85f9609cbb Merge remote-tracking branch 'origin/master' into ambulance_service
# Conflicts:
#	android/app/libs/PenNavUI.aar
#	android/app/libs/Penguin.aar
#	android/app/libs/PenguinRenderer.aar
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/strings.xml
#	android/build/reports/problems/problems-report.html
#	ios/Runner/AppDelegate.swift
5 months ago
haroon amjad 1c883764ac updates 6 months ago
Sultan khan 40638cfec4 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:
  collapsing_list_view improvement
  Updated design for HHC
  updates & fixes
  QLine API implementation enhancements
  LiveCare flow from clinic selection implemented

# Conflicts:
#	lib/presentation/home/landing_page.dart
6 months ago
haroon amjad 575a534f5e PenguinIn fixes 6 months ago
haroon amjad 3060c57201 updates 6 months ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 6 months ago
haroon amjad 3699163579 PenguinIn SDK changes 6 months ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 6 months ago
haroon amjad 36bf63dcde Incoming call updates 7 months ago
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 7 months ago
tahaalam 1f852f63cf penguin sdk added 7 months ago
Haroon6138 622851a1a0 Merge pull request 'Design Fixes for Responsiveness (faiz_dev)' (#88) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/88
8 months ago
faizatflutter 495eb13153 Updated README.md 8 months ago
tahaalam 90128a812b call ambulance module design added. 8 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 10 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 10 months ago
Haroon Amjad 2b22e17743 android fixes 10 months ago
aamir-csol 59054df238 android / ios folder push 10 months ago