Aamir Muhammad
|
77651f9652
|
Merge remote-tracking branch 'origin/Dev_3.3_InPatient_CR' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/viewModels/project_view_model.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/MyAppointments/MyAppointments.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/login/confirm-login.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/push-notification-handler.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/uitl/utils_new.dart
# lib/widgets/avatar/large_avatar.dart
# lib/widgets/bottom_navigation/bottom_navigation_item.dart
# lib/widgets/bottom_options/BottomSheet.dart
# lib/widgets/data_display/medical/medical_profile_item.dart
# lib/widgets/drawer/app_drawer_widget.dart
# pubspec.yaml
|
2 years ago |
devamirsaleemahmad
|
0e8c1a8b2f
|
Merge branch 'development_v3.3' into dev_v3.13.6
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/ToDoList/ToDo.dart
# lib/pages/ToDoList/widgets/paymentDialog.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/pages/medical/labs/laboratory_result_page.dart
# pubspec.yaml
|
2 years ago |
haroon amjad
|
b579e494c1
|
updates
|
2 years ago |
Sultan khan
|
413535ef0b
|
null safety fixed.
|
2 years ago |
haroon amjad
|
7c426b90e5
|
updates
|
2 years ago |
haroon amjad
|
bbee4dba66
|
CR 6654 cancel manual insurance update CR done.
|
2 years ago |
devamirsaleemahmad
|
dfc6e86442
|
models updates -> 3.13.6
|
2 years ago |
Sultan khan
|
b45cbbcf29
|
updates
|
2 years ago |
haroon amjad
|
f0a4bd6925
|
Commented the CRs code
|
2 years ago |
haroon amjad
|
af5b0766a2
|
CR 6654, Disable update manual insurance temporarily.
|
2 years ago |
haroon amjad
|
72ee34f9a7
|
Merge branch 'development_v3.3' into Dev_3.3_InPatient_CR
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/insurance/AttachInsuranceCardImageDialog.dart
# lib/uitl/translations_delegate_base.dart
|
2 years ago |
haroon amjad
|
0f863cd259
|
Updates & fixes
|
2 years ago |
haroon amjad
|
7280e2a1d7
|
Birth Notification UI Implemented
|
3 years ago |
haroon amjad
|
22a0e456bc
|
Manual Insurance Updates, Service ID fixes, Tamara Fixes
|
3 years ago |
haroon amjad
|
7ae4e7d616
|
updates & fixes
|
3 years ago |
haroon amjad
|
5163c826ad
|
Updates & fixes
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
Mirza.Shafique
|
a234618df8
|
Update, Insurance card and My Balance Design
|
4 years ago |
Mohammad Aljammal
|
9c12e949e8
|
hot fixes
|
5 years ago |