Commit Graph

551 Commits (870da89aec6bcc15b1a32298b74373a2369988ea)

Author SHA1 Message Date
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
3 years ago
Sultan Khan 821a9b5ade Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 2c1d7c511e family file changes 3 years ago
haroon amjad 230d87c473 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 3 years ago
haroon amjad 2690bddcac Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 5163c826ad Updates & fixes 3 years ago
Sikander Saleem 6099738a5c improvements 3 years ago
Haroon Amjad 19edcc210e Rate appointment UI implemented 3 years ago
haroon amjad 89e1aa70c0 updates 3 years ago
Sikander Saleem df32ae0142 lab order clinic/hospital name, prescription reminder ui, prescription availibility 3 years ago
Haroon Amjad 062ca5c11c EReferral fixes 3 years ago
Haroon Amjad abcb71e86e Invoice details UI revamped 3 years ago
haroon amjad 0955a22616 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad fa8c739b2c updates & fixes 3 years ago
haroon amjad 46d800c0c6 UI updates & fixes 3 years ago
Mirza.Shafique ef8006efd8 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
#	lib/pages/Covid-DriveThru/covid-payment-alert.dart
#	lib/pages/Covid-DriveThru/covid-payment-details.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
3 years ago
Mirza.Shafique 5b330b2a25 Covid New Design 3 years ago
haroon amjad 5c64ce4795 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/DoctorProfile.dart
#	lib/pages/MyAppointments/SchedulePage.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sultan Khan c54146b3ba sechedule fix 3 years ago
haroon amjad f55fbd1cc2 UI fixes 3 years ago
haroon amjad 4b1a2d4f3d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
3 years ago
haroon amjad a075d53dd5 UI updates & fixes 3 years ago
Sikander Saleem 7b8093b7ba Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem c1b23b7c2a improvements 3 years ago
Mirza.Shafique e24eaa791b Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 5b47aaac6f icon and find us distance 3 years ago
haroon amjad 728c22cc68 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/insurance/insurance_approval_screen.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem e37781c3a6 insurance approval screen and detail screen ui changes. 3 years ago
haroon amjad 92bfe27a6e updates & fixes 3 years ago
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
3 years ago
Sikander Saleem f0bb94c422 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 1200dbeb70 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad c050633671 SignalR Updates 3 years ago
Sultan Khan f9f5a886a9 VITAL SIGN FIXED 3 years ago
haroon amjad 0a90791aca Push notification fixes 3 years ago
haroon amjad b1128be94f Updates & fixes 3 years ago
haroon amjad e5a636b704 Covid Test changes 3 years ago
haroon amjad e8bb4e962c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
3 years ago
Mirza.Shafique 717c7b3be4 Lab results designs enhancements 3 years ago
Fatimah Alshammari bcfbca98a1 fixed arabic version 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 3 years ago
haroon amjad 0fe4a21388 updates & fixes 3 years ago
haroon amjad 2d7c7239c5 Health Converters fixes 3 years ago
haroon amjad f795ba24c5 updates & fixes 3 years ago
haroon amjad f33272f8d9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
haroon amjad ec646a7039 My Invoice fixes, Prescription page fixes 3 years ago
Mirza.Shafique b3f3558eac CMC 1.2 3 years ago