Commit Graph

1969 Commits (99b87b1f847a2274a3d95cddd073e66b787f7406)
 

Author SHA1 Message Date
Sikander Saleem c96fa62363 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem e36e0ce0b7 h20 bottom nav bar bug fix (happen in release mode) 3 years ago
haroon amjad 19e6954bc8 updates 3 years ago
haroon amjad c3feed771c merge conflicts resolved 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 2ae5c8f657 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!395
3 years ago
haroon amjad b0f4cfcff3 Family file fixes 3 years ago
Sultan Khan e48d4e5eb2 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 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
Sultan khan 4fb2c24072 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!394
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
haroon amjad ba7d0329c3 Dental Invoices UI 3 years ago
haroon amjad af7b27258c Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sultan khan ed468c6fad Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!393
3 years ago
Sultan Khan 0e43ca173a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan d535cb421d bug fixes 3 years ago
haroon amjad f9b57ce4aa Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 4ac0845003 updates & fixes 3 years ago
Mirza.Shafique 719cdbd2e4 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 8a4cf9f23b Line Chart Fix in Vital Signs 3 years ago
Sikander Saleem baf4eab604 prescription order detail ui changes 3 years ago
haroon amjad bbcf22ddfa Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
3 years ago
haroon amjad 92bfe27a6e updates & fixes 3 years ago
Sikander Saleem 4caacb968b Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem d9405b2bd0 prescription order log ui changes 3 years ago
Sikander Saleem 8e27d8210a prescription detail ui changes. 3 years ago
Mirza.Shafique 350882b1d2 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique ef2bcc1c65 Web RTC Design implementation 3 years ago
haroon amjad ad3463bbfc active medication design revamped 3 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
3 years ago
haroon amjad 304ba8afa4 bas app client fixes 3 years ago
Sikander Saleem 8cb342cb24 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 9d67704c67 prescription detail ui changes(cont). 3 years ago
Sultan khan dfd01d3033 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
login issue fixed

See merge request Cloud_Solution/diplomatic-quarter!392
3 years ago
Sultan Khan 2ebfdcfdd7 login issue fixed 3 years ago
Sikander Saleem 259163481c Merge branch 'development_new_design_2.0' into new_design_sikander 3 years ago