haroon amjad
|
ade3cb0899
|
File no & UI changes
|
4 years ago |
haroon amjad
|
1dcfe44e96
|
Translations
|
4 years ago |
Sikander Saleem
|
706832a1cb
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/locator.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/home_page.dart
# lib/pages/parent_categorise_page.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/cart-order-preview.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/widgets/ProductTileItem.dart
# lib/pages/search_products_page.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/others/app_scafold_detail_page.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
4 years ago |
haroon amjad
|
43a672cc68
|
Updates & fixes
|
4 years ago |
haroon amjad
|
5d44fff28d
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
4 years ago |
Mirza.Shafique
|
ab6f7b8915
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
Mirza.Shafique
|
eeaf7d9d2f
|
HMG Services Detail View
|
4 years ago |
Sikander Saleem
|
f13871de9a
|
find us and prescription availability hospital location ui changes,
|
4 years ago |
haroon amjad
|
90843252c3
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
# lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Fatimah Alshammari
|
9cf0794cf6
|
Fixed out of stuck items issues
|
4 years ago |
haroon amjad
|
6d3ead24e1
|
localisation update
|
4 years ago |
Mirza.Shafique
|
05a6860081
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
e1b79ef5c1
|
E-Refreal design
|
4 years ago |
haroon amjad
|
e564cdc7e5
|
Updates & fixes
|
4 years ago |
haroon amjad
|
6511ca8dc7
|
UI fixes & updates
|
4 years ago |
Sikander Saleem
|
ae85f75e81
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/feedback/status_feedback_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
a026fbf940
|
feedback status added.
|
4 years ago |
Sikander Saleem
|
8f371f87d2
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Mirza.Shafique
|
dde16a13fe
|
General page in profile
|
4 years ago |
haroon amjad
|
b475adb5c3
|
Updates & fixes
|
4 years ago |
Mirza.Shafique
|
d664a216c6
|
Profile Page and Back Button Click
|
4 years ago |
haroon amjad
|
cb220031dd
|
Updates & fixes
|
4 years ago |
haroon amjad
|
587210ee58
|
UI fixes
|
4 years ago |
haroon amjad
|
a819660536
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
haroon amjad
|
01ccd484f4
|
Calendar plugin changed
|
4 years ago |
Sikander Saleem
|
08960867f7
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
55df00dcd4
|
h20 today ui (cont.)
|
4 years ago |
Sikander Saleem
|
763c16ddd0
|
h2o setting ui redesigned.
|
4 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
|
4 years ago |
Sultan Khan
|
821a9b5ade
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
4 years ago |
Sultan Khan
|
2c1d7c511e
|
family file changes
|
4 years ago |
haroon amjad
|
230d87c473
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/feedback/send_feedback_page.dart
|
4 years ago |
haroon amjad
|
01ca8b8f84
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
8b49eed6ae
|
hospital text replaced with branch
|
4 years ago |
Elham Rababh
|
3dc28d318a
|
fix bugs on wish list
|
4 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
|
4 years ago |
haroon amjad
|
5163c826ad
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
6099738a5c
|
improvements
|
4 years ago |
Haroon Amjad
|
19edcc210e
|
Rate appointment UI implemented
|
4 years ago |
haroon amjad
|
89e1aa70c0
|
updates
|
4 years ago |
Sikander Saleem
|
df32ae0142
|
lab order clinic/hospital name, prescription reminder ui, prescription availibility
|
4 years ago |
Haroon Amjad
|
062ca5c11c
|
EReferral fixes
|
4 years ago |
Haroon Amjad
|
abcb71e86e
|
Invoice details UI revamped
|
4 years ago |
hussam al-habibeh
|
dbf7ebf287
|
fix most viewed & best sellers moduls
|
4 years ago |
haroon amjad
|
0955a22616
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
fa8c739b2c
|
updates & fixes
|
4 years ago |
haroon amjad
|
46d800c0c6
|
UI updates & fixes
|
4 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
|
4 years ago |
Mirza.Shafique
|
5b330b2a25
|
Covid New Design
|
4 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
|
4 years ago |
Sultan Khan
|
c54146b3ba
|
sechedule fix
|
4 years ago |
haroon amjad
|
f55fbd1cc2
|
UI fixes
|
4 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
|
4 years ago |
haroon amjad
|
a075d53dd5
|
UI updates & fixes
|
4 years ago |
Sikander Saleem
|
7b8093b7ba
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
c1b23b7c2a
|
improvements
|
4 years ago |
Mirza.Shafique
|
e24eaa791b
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
5b47aaac6f
|
icon and find us distance
|
4 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
|
4 years ago |
Sikander Saleem
|
e37781c3a6
|
insurance approval screen and detail screen ui changes.
|
4 years ago |
haroon amjad
|
92bfe27a6e
|
updates & fixes
|
4 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
|
4 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
|
4 years ago |
haroon amjad
|
1200dbeb70
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
c050633671
|
SignalR Updates
|
4 years ago |
Sultan Khan
|
f9f5a886a9
|
VITAL SIGN FIXED
|
4 years ago |
haroon amjad
|
0a90791aca
|
Push notification fixes
|
4 years ago |
haroon amjad
|
b1128be94f
|
Updates & fixes
|
4 years ago |
haroon amjad
|
e5a636b704
|
Covid Test changes
|
4 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
|
4 years ago |
Mirza.Shafique
|
717c7b3be4
|
Lab results designs enhancements
|
4 years ago |
Fatimah Alshammari
|
bcfbca98a1
|
fixed arabic version
|
4 years ago |
haroon amjad
|
7467da7409
|
Imports organized
|
4 years ago |
Fatimah Alshammari
|
8c0dca781c
|
fixed compare issues and arabic version
|
4 years ago |
haroon amjad
|
0fe4a21388
|
updates & fixes
|
4 years ago |
haroon amjad
|
2d7c7239c5
|
Health Converters fixes
|
4 years ago |
haroon amjad
|
f795ba24c5
|
updates & fixes
|
4 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
|
4 years ago |
haroon amjad
|
ec646a7039
|
My Invoice fixes, Prescription page fixes
|
4 years ago |
Mirza.Shafique
|
b3f3558eac
|
CMC 1.2
|
4 years ago |
Mirza.Shafique
|
82a1d410db
|
Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
# lib/pages/landing/widgets/logged_slider_view.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sultan Khan
|
2019e804f0
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
4 years ago |
Sultan Khan
|
169aafa26b
|
hmc services design fixed
|
4 years ago |
Mirza.Shafique
|
831780555c
|
CMC 1.0
|
4 years ago |
haroon amjad
|
3bb0a8b85b
|
Apple Pay finalized, Translation issues fixed, other updates
|
4 years ago |
haroon amjad
|
ebcc2559ce
|
Ask doctor issue resolved, Translation & font family issues resolved
|
4 years ago |
haroon amjad
|
25fb5decc0
|
Ask Doctor page fixes
|
4 years ago |
Sultan Khan
|
671c432cd7
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
|
4 years ago |
Sultan Khan
|
0086875d0d
|
Design Updated for tracker
|
4 years ago |
Sikander Saleem
|
120e6c166d
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
c84707ba3f
|
monthly report request & sick leaves ui redesigned.
|
4 years ago |
haroon amjad
|
9ffe064a3b
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
d1b7c94d6e
|
improvement.
|
4 years ago |
Sikander Saleem
|
d9c1b8b8ea
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/main.dart
# lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
# lib/pages/medical/eye/EyeMeasurementsPage.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
|
4 years ago |
haroon amjad
|
4469ae1209
|
updates & fixes
|
4 years ago |
Sikander Saleem
|
fab051f9e7
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Mohammad Aljammal
|
55f9bbcba4
|
Merge branch 'fatima-new' into 'development'
Fatima new
See merge request Cloud_Solution/diplomatic-quarter!379
|
4 years ago |
Sikander Saleem
|
a61fea551c
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Mirza.Shafique
|
590ea48ea9
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/pages/BookAppointment/DoctorProfile.dart
# lib/pages/BookAppointment/book_reminder_page.dart
# lib/pages/MyAppointments/SchedulePage.dart
|
4 years ago |