Commit Graph

94 Commits (151fcf23d1e84acf17c4c0e0830e4a0a3e81f546)

Author SHA1 Message Date
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
2 weeks ago
haroon amjad f46b3f745f Dark mode enabled 3 weeks 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
1 month ago
tahaalam bfeb3dce4e data integration along with the data representation 1 month ago
haroon amjad dc0e4e5eb6 Updates & fixes, Filter issues fixed for lab & rad 1 month ago
haroon amjad 4b710523e8 Feedback status implemented 1 month ago
haroon amjad 01c21377aa Updates & fixes 1 month ago
haroon amjad 68f5e64557 updates 1 month ago
Haroon Amjad 23abbebf9e arabic fixes 1 month ago
Haroon Amjad a4573c8710 arabic fixes 1 month ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 2 months ago
haroon amjad 70a6d90ce3 updates & fixes 2 months ago
Sikander Saleem 77a04e637e UI/UX improvements. 2 months ago
haroon amjad ede8844f19 Monthly Reports implemented 3 months ago
faizatflutter d4dd475e0b Added Graph 3 months ago
faizatflutter 333046951c Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/routes/app_routes.dart
3 months ago
aamir-csol 135b05e561 Health calculators & converters 3 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 3 months ago
faizatflutter 34f4cd4f91 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
4 months ago
aamir-csol f91f8e63d7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/medical_file/widgets/lab_rad_card.dart
4 months ago
aamir-csol d256eec392 medical file changes 4 months ago
faizatflutter e35fe9ac05 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
4 months ago
haroon amjad 36bf63dcde Incoming call updates 4 months ago
faizatflutter 757ace2ba1 Added Organ Selector 4 months ago
haroon amjad 07a3052b8e appointment prescription implemented 4 months ago
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
4 months ago
faizatflutter fe00447483 HHC in Progress 4 months ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 4 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 5 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
5 months ago
faizatflutter 8c956fc052 Design changes 5 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
5 months ago
tahaalam 90128a812b call ambulance module design added. 5 months ago
faizatflutter eabfaf8182 Design Updates 5 months ago
haroon amjad fe5b6c35ac insurance approval implementation done 6 months ago
aamir-csol 9e8011c34c family screen & widgets 6 months ago
Haroon6138 938d95cb06 Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/55
6 months ago
taha.alam 27a0632d6d directional padding and alignment 6 months ago
aamir-csol a79dcad221 family screen & widgets 6 months ago
aamir-csol 8240d3e78d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/authentication/register_step2.dart
6 months ago
haroon amjad 3b5d2d27a4 Updates 6 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 6 months ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 6 months ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 6 months ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 6 months ago
Sikander Saleem c83754fc4a user profile welcome widget improvement. 6 months ago
Sikander Saleem 8f0e910e4f profile and settings ui completed. 6 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 6 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 6 months ago
Sikander Saleem 50c3a8e595 collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading 7 months ago