Commit Graph

77 Commits (dda4dbeba9715a1460ffe6c64b9334c56a48689e)

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 8de8039096 updates 3 weeks ago
tahaalam 71ac91a076 calender package added 3 weeks ago
haroon amjad f5aa12a04b Android zoom fixes 3 weeks ago
haroon amjad b75f0c7ee4 updates 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 105ab2326a updates 1 month ago
haroon amjad 8309f311e6 App update page implemented 1 month ago
haroon amjad 530b87282f updates & fixes 1 month ago
haroon amjad 9ed016ad8b updates & fixes 2 months ago
Haroon Amjad 49542a9112 updates & fixes 2 months ago
Haroon Amjad 1ae1212733 Merge branch 'master' into haroon_dev 2 months ago
Haroon Amjad 537d93915e Zoom SDK fixes 2 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 2 months ago
haroon amjad f46f978326 Clinic icons updated 2 months ago
Fatimah.Alshammari 69666a6f6c fixed button 2 months ago
faizatflutter d4dd475e0b Added Graph 3 months ago
haroon amjad eff6cbbaad updates & fixes 3 months ago
haroon amjad d202aa8423 Smartwatch integration started 3 months ago
tahaalam 2125e30c23 Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
4 months ago
tahaalam ac15ab26f5 graph changes for high and low 4 months ago
haroon amjad b37804d012 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/prescriptions/prescriptions_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
4 months ago
haroon amjad 36bf63dcde Incoming call updates 4 months ago
tahaalam fc0f98da1d calender reminder added 4 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 72d765e508 Design Updates 5 months ago
tahaalam ea92a0c75c laser appointment screen added 6 months ago
tahaalam 36bf229787 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
6 months ago
tahaalam da89c41925 lab result by hospital and translations are added 6 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 6 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
6 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 6 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 6 months ago
taha.alam 92c3033087 Merge remote-tracking branch 'origin/master' into functionality/graph 6 months ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 6 months ago
Haroon Amjad 1c2564a1e2 updates 6 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 6 months ago
Haroon Amjad a4854bbe4a Habib Wallet updates 6 months ago
taha.alam 3fdd17ccaa code added to get the location for gms hms and iphone. fallback added if the last known location is null. 6 months ago
Sultan khan cd5da116f9 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/authentication/widgets/otp_verification_screen.dart
6 months ago
Sultan khan fe36c2a1c1 auto sms 6 months ago
taha.alam 788887a7f1 Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart
6 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 6 months ago
haroon amjad 6f745f3666 calendar implementation contd. 6 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
6 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 6 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 6 months ago
haroon amjad ccd29f0cf9 updates 7 months ago