Commit Graph

1542 Commits (fc67d0d14d20355d6e6aee41887aa6bb378ed8dc)

Author SHA1 Message Date
haroon amjad a819660536 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
haroon amjad 01ccd484f4 Calendar plugin changed 3 years ago
Sultan khan 7e095248c5 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
family files changes

See merge request Cloud_Solution/diplomatic-quarter!428
3 years ago
Sultan Khan 9010558dc9 family files changes 3 years ago
Sikander Saleem 08960867f7 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 2aa6ad5d6b h20 today ui (cont.)1 3 years ago
Sikander Saleem 55df00dcd4 h20 today ui (cont.) 3 years ago
haroon amjad 7264d03818 Family Files previleges fix 3 years ago
Sikander Saleem 763c16ddd0 h2o setting ui redesigned. 3 years ago
haroon amjad 259581c4f8 updates & fixes 3 years ago
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
haroon amjad 2c4ff16f0c updates & fixes 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
Mirza.Shafique cb230db0c5 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique a9773e81e7 Bug Fixes prescription 3 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 3 years ago
Sikander Saleem b4031e973e chevron icon to arrow forward 3 years ago
haroon amjad 503ab739ca prescription availability design revamped 3 years ago
haroon amjad 46a572674f Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 69af6799c4 updates 3 years ago
Mirza.Shafique 3a40eb92be Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 06c5ee269b Bug Fixes 3 years ago
Sultan Khan 1b387c2dbf changes pushed 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
Sultan Khan d514f64870 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 76e16594ba FAMILY FILES 3 years ago
Sikander Saleem 6099738a5c improvements 3 years ago
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 3 years ago
Sikander Saleem 5410b826c3 prescriptions new ui updated. 3 years ago
Haroon Amjad 19edcc210e Rate appointment UI implemented 3 years ago
haroon amjad 89e1aa70c0 updates 3 years ago
haroon amjad 22c6a8ce42 no message 3 years ago
haroon amjad 85d68b0388 ereferral fixes 3 years ago
Sultan Khan fee23de1fd hhc changes 3 years ago
haroon amjad f6d779431a fixes 3 years ago
haroon amjad 8133f8a23a Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 46cc73bdd7 CMC changes 3 years ago
Sultan Khan 6159be0f75 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 5fe0214e04 bug fixes 3 years ago
haroon amjad 8cc36ae848 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad dfafb6b664 fixes 3 years ago
Mirza.Shafique c23478b838 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 205b4d6b21 Photo view in CMC 3 years ago
Sikander Saleem d1f3428def Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem df32ae0142 lab order clinic/hospital name, prescription reminder ui, prescription availibility 3 years ago
haroon amjad 879ce4ee06 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 7675a4496a my vaccine & lab result fix 3 years ago
Sultan Khan a4ab22a4aa Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 5b988dff4f BUG FIXES 3 years ago
Mirza.Shafique 5e383e57d9 CMC error Fixes 3 years ago
Sikander Saleem 3403e07aba recall prescription order log when refill or cancel order. 3 years ago
Haroon Amjad 062ca5c11c EReferral fixes 3 years ago
Haroon Amjad abcb71e86e Invoice details UI revamped 3 years ago
haroon amjad c91b8ce777 My Vaccines design revamped 3 years ago
haroon amjad dfeb249a54 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad a4a2389a78 updates & fixes 3 years ago
Sikander Saleem f63293ef3e login input rtl 3 years ago
Sultan Khan fc9f2fc34e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 3 years ago
Sikander Saleem 5bdb56df60 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 5fda70decf cmc & hhc order log ui improvements. 3 years ago
Mirza.Shafique bc246b2f9f Merge branch 'development_new_design_2.0' into mirza_home_page 3 years ago
Mirza.Shafique f0566fb069 CMC Images 3 years ago
haroon amjad 184942e891 Covid Payment fixes 3 years ago
haroon amjad ab8030416c Updates & fixes 3 years ago
Mirza.Shafique 9b160958bb Covid New Design 3 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
Mirza.Shafique 6e244a55f5 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique 7563a2870b Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique b80e2ea16e Covid New Design 2 3 years ago
Sikander Saleem 74432b6bbb cmc order log ui changes 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
Sikander Saleem 9f8bcc63f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/medical/prescriptions/prescriptions_history_details_page.dart
3 years ago
Sikander Saleem 4ce941e01e prescription order log detail view change on arabic 3 years ago
haroon amjad 19e6954bc8 updates 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
haroon amjad b0f4cfcff3 Family file fixes 3 years ago
Sultan Khan c54146b3ba sechedule fix 3 years ago
haroon amjad 2fc5425884 Merge branch 'development_new_design_2.0' into haroon-new-design 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
Sultan Khan 54ac31a74c Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan a57facb876 family file fix 3 years ago
Sultan Khan c58023efc3 family file 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 0348397df3 insurance approval detail company name added. 3 years ago
Sikander Saleem 4a30c59f83 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem e37781c3a6 insurance approval screen and detail screen ui changes. 3 years ago