Commit Graph

79 Commits (haroon_dev)

Author SHA1 Message Date
haroon amjad 9d04133b8d Lakum integration completed 3 months ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 3 months ago
haroon amjad 572c37785b updates 4 months ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 4 months ago
haroon amjad 830086a5b9 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad a8620c1f72 updates 4 months ago
tahaalam a2fa661db4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
4 months ago
tahaalam 8a11cc03cb pickup direction bottom sheet added and previous radio bottom sheet removed 4 months ago
aamir-csol 5be4f66718 doctor ratings. 4 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
4 months ago
haroon amjad 0ed6103b15 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
5 months ago
haroon amjad f46b3f745f Dark mode enabled 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
6 months ago
tahaalam d137e1166d watch integration ui added. 6 months ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 6 months ago
aamir-csol 2bbfe1f131 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/profile_settings/profile_settings.dart
6 months ago
aamir-csol 8b701255ed logout & family file fix 6 months ago
faizatflutter 07447e148b Symptoms Checker flow is completed 6 months ago
Fatimah.Alshammari 250af1506c Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/services/dialog_service.dart
#	lib/theme/colors.dart
7 months ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 7 months ago
Fatimah.Alshammari 20e4f82df3 Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
7 months ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
7 months ago
Fatimah.Alshammari 11de01e079 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
7 months ago
faizatflutter d4dd475e0b Added Graph 7 months ago
Sultan khan 873b2a1591 sorting done, covid inprogress 7 months ago
Fatimah.Alshammari f3674ba06f Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
7 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 7 months ago
haroon amjad 450f07d39d updates & fixes 7 months ago
Fatimah.Alshammari 3d8daeb58d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/core/utils/calendar_utils.dart
#	lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
#	pubspec.yaml
7 months ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
8 months ago
haroon amjad a83a35a284 Services Page Revamp 8 months ago
faizatflutter ac84d268e9 triage design 8 months ago
faizatflutter acb6d31ff3 Added possible conditions screen 8 months ago
faizatflutter 757ace2ba1 Added Organ Selector 8 months ago
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
8 months ago
faizatflutter fe00447483 HHC in Progress 8 months ago
faizatflutter da579dfd09 CMC Module Completed 8 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
8 months ago
Fatimah.Alshammari eae16eec44 active medication 8 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 9 months ago
tahaalam 90128a812b call ambulance module design added. 9 months ago
tahaalam 6cf08c04d2 appointment filters added. 10 months ago
haroon amjad 093e645f60 request medical report implementation completed. 10 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 10 months ago
Sultan khan 32c7608c83 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 10 months ago
aamir-csol a79dcad221 family screen & widgets 10 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 10 months ago
Sikander Saleem f9859036ef ui improvements. 11 months ago