haroon amjad
|
6b675acc94
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
4 years ago |
Sultan Khan
|
b891c1bd80
|
theme issue
|
4 years ago |
|
haroon amjad
|
da3ad90ddd
|
added app-wide route transition animation
|
4 years ago |
|
haroon amjad
|
deb0b40cfe
|
fixes
|
4 years ago |
Mohammad Aljammal
|
29f4e6acb6
|
Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing
See merge request Cloud_Solution/diplomatic-quarter!262
|
4 years ago |
|
haroon amjad
|
9ecf745747
|
fixes
|
4 years ago |
|
haroon amjad
|
b6c617888b
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
mosazaid
|
0444b21101
|
Merge branch 'development' into hmg-services-fixing
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
822defbd04
|
working on bmi calculator design and functionality
|
4 years ago |
|
haroon amjad
|
7c538b350f
|
LiveCare Scheduling finalized, Appointments in ToDo list categorized
|
4 years ago |
|
haroon amjad
|
dde10cd27b
|
working in LiveCare Scheduling
|
4 years ago |
Mohammad Aljammal
|
298b4d6525
|
change color
|
4 years ago |
|
Mohammad Aljammal
|
18dad434a0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/core/service/weather_service.dart
lib/core/viewModels/dashboard_view_model.dart
lib/main.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
lib/pages/BookAppointment/Search.dart
lib/pages/ErService/AmbulanceReq.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/pages/login/register.dart
lib/pages/medical/allergies_page.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/doctor/doctor_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
lib/pages/medical/vital_sign/vital_sign_details_screen.dart
lib/uitl/location_util.dart
lib/widgets/drawer/app_drawer_widget.dart
pubspec.yaml
|
4 years ago |
Haroon Amjad
|
b0ea1fc262
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
8c9762c24f
|
Fixes
|
4 years ago |
|
Mohammad Aljammal
|
7167d58ce2
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
aa89a05f1d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
ios/Flutter/.last_build_id
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/core/service/medical/prescriptions_service.dart
lib/core/viewModels/project_view_model.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/BookAppointment/BookConfirm.dart
lib/pages/BookAppointment/DoctorProfile.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/MyAppointments/models/ArrivedButtons.dart
lib/pages/MyAppointments/widgets/AppointmentActions.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/feedback/send_feedback_page.dart
lib/pages/insurance/insurance_approval_screen.dart
lib/pages/insurance/insurance_card_screen.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/pages/medical/balance/my_balance_page.dart
lib/pages/medical/labs/laboratory_result_page.dart
lib/pages/medical/labs/labs_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/patient_sick_leave_page.dart
lib/pages/medical/prescriptions/prescription_details_page.dart
lib/pages/medical/prescriptions/prescription_items_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/pages/medical/radiology/radiology_home_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/pages/medical/reports/reports_page.dart
lib/pages/pharmacies/pharmacies_list_screen.dart
lib/pages/settings/profile_setting.dart
lib/services/authentication/auth_provider.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/floatingActionButton.dart
lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
lib/widgets/data_display/medical/doctor_card.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
haroon amjad
|
781fd1c287
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Haroon Amjad
|
3308aa47e1
|
fixes
|
4 years ago |
|
haroon amjad
|
051bd1e23f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
951d9b553f
|
fixes & updates
|
4 years ago |
|
haroon amjad
|
740a294867
|
Translation & bug fixes
|
4 years ago |
|
Haroon Amjad
|
9d3c64200e
|
fixes
|
4 years ago |
|
haroon amjad
|
c4bb75eab4
|
Doctor rating fixed
|
4 years ago |
|
haroon amjad
|
a1f91d99b3
|
added countdown timer in my appointments
|
4 years ago |
|
haroon amjad
|
dfa1952f4d
|
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
|
4 years ago |
|
haroon amjad
|
7edb0c8009
|
Doctor rating dialog revamped
|
4 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
|
haroon amjad
|
e5feef8a9d
|
Updates & UI Fixes
|
4 years ago |
|
haroon amjad
|
d284ceac04
|
advance payment & payment flow issues fixed
|
4 years ago |
|
Sultan Khan
|
fdef34a394
|
viral sign issue
|
4 years ago |
|
Sultan Khan
|
3589b21590
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
haroon amjad
|
b89c1f03b3
|
language translation fixes
|
4 years ago |
|
Sultan Khan
|
f05b235cd0
|
login issue
|
4 years ago |
|
haroon amjad
|
2e484d7535
|
QR Code loading issue resolved
|
4 years ago |
|
haroon amjad
|
10efccbce8
|
my appointment fixes
|
4 years ago |
|
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
4 years ago |
|
haroon amjad
|
b7b7ead3ba
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
f0897881d1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
d75e5caf08
|
fixed appointment online checkIn issue
|
4 years ago |
Mohammad Aljmma
|
4a4d5248a2
|
fix status issue
|
4 years ago |
Elham Rababah
|
64f970c40c
|
Fix issues after the merge
|
4 years ago |
|
haroon amjad
|
5020c24e8b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/services/authentication/auth_provider.dart
|
4 years ago |
|
haroon amjad
|
15a8e64e7c
|
updates & fixes
|
4 years ago |
|
Sultan Khan
|
d939b2ec9b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
f8e05fc447
|
regiter issue
|
4 years ago |
|
haroon amjad
|
4f53d058d4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
aeab57beab
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/main.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
|
haroon amjad
|
f5a2870fac
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
Implemented Badge count on ToDo list & my appointments
|
4 years ago |
|
Mohammad Aljmma
|
479aea4df8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
lib/uitl/translations_delegate_base.dart
|
4 years ago |