hussam al-habibeh
|
5927f3e35f
|
pharmacy home page update
|
3 years ago |
haroon amjad
|
75989bdc01
|
Health Calculators translations
|
3 years ago |
|
haroon amjad
|
90b821a37d
|
Offers & packages UI completed
|
3 years ago |
|
haroon amjad
|
d2834bb3dd
|
Health calculator fixes
|
3 years ago |
|
haroon amjad
|
ea745f1b9f
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
haroon amjad
|
efe8dea9a9
|
Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design
See merge request Cloud_Solution/diplomatic-quarter!489
|
3 years ago |
|
haroon amjad
|
502c7fd3de
|
Offers & discounts UI updating
|
3 years ago |
devmirza121
|
566de7936a
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
devmirza121
|
6225f2468d
|
Health Calculator 3.0
|
3 years ago |
Fatimah Alshammari
|
ce0dff11b2
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
3 years ago |
|
Fatimah Alshammari
|
eb4801c7ee
|
fixed rating issues
|
3 years ago |
|
Haroon Amjad
|
d5c68c5032
|
Packages & offers design
|
3 years ago |
|
haroon amjad
|
b752b42a34
|
Updates & fixes
|
3 years ago |
|
devmirza121
|
d4eab13982
|
Health Calculator 2.0
|
3 years ago |
|
devmirza121
|
e13d64dbf7
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
devmirza121
|
0b8600605b
|
Health Calculator 1.0
|
3 years ago |
|
Fatimah Alshammari
|
77c8c85e88
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
3 years ago |
|
haroon amjad
|
9ce77b56b9
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
Fatimah Alshammari
|
ca11fe3134
|
fix issues
|
3 years ago |
|
haroon amjad
|
30e67bbe3e
|
updates
|
3 years ago |
|
haroon amjad
|
c253ec3110
|
LiveCare UI revamped
|
3 years ago |
|
haroon amjad
|
f995a9fa8e
|
Ambulance request UI revamped
|
3 years ago |
|
Fatimah Alshammari
|
239d2c1036
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
3 years ago |
|
Fatimah Alshammari
|
23acdfd494
|
fix loader issue and design
|
3 years ago |
|
haroon amjad
|
894cc0e336
|
Updates & fixes
|
3 years ago |
|
haroon amjad
|
e1e31de818
|
Lakum fixes
|
3 years ago |
|
haroon amjad
|
72784f68b9
|
Fixes & updates
|
3 years ago |
|
haroon amjad
|
be771917f0
|
pharmacy fixes
|
3 years ago |
|
haroon amjad
|
bebcd85557
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
5943522163
|
UI fixes
|
3 years ago |
|
Fatimah Alshammari
|
28678633e7
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/lakum-main-page.dart
|
3 years ago |
|
Fatimah Alshammari
|
78fc77159c
|
fix lakum issues
|
3 years ago |
|
haroon amjad
|
8d6278a59b
|
Pharmacy fixes
|
3 years ago |
|
haroon amjad
|
925e3cb686
|
Merge branch 'development' into haroon-new-design
# Conflicts:
# lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
# lib/main.dart
# lib/pages/final_products_page.dart
# lib/pages/landing/landing_page_pharmcy.dart
# lib/pages/login/login.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacies/screens/product-details/product-detail.dart
# lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
# lib/pages/pharmacy/profile/profile.dart
# lib/services/pharmacy_services/product_detail_service.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
|
3 years ago |
|
haroon amjad
|
585e26b091
|
Registration fix
|
3 years ago |
Mohammad Aljammal
|
fd46259701
|
Merge branch 'bottom_nav_pharmacy' into 'development'
show bottom nav in pharmacy all pages
See merge request Cloud_Solution/diplomatic-quarter!479
|
3 years ago |
|
hussam al-habibeh
|
cb85085969
|
show bottom nav in pharmacy all pages
|
3 years ago |
|
Mohammad Aljammal
|
c0cf2f71a2
|
Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy
See merge request Cloud_Solution/diplomatic-quarter!478
|
3 years ago |
|
hussam al-habibeh
|
46d7e7ee14
|
show bottom nav in pharmacy all pages
|
3 years ago |
|
haroon amjad
|
f15090c634
|
Merge branch 'development_new_design_2.0' into 'sultan_new_design'
# Conflicts:
# lib/pages/login/register.dart
|
3 years ago |
|
haroon amjad
|
8c99bba17b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
e7f5fc8434
|
Blood donation fixes
|
3 years ago |
Sultan Khan
|
64e62235c4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design
|
3 years ago |
|
Sultan Khan
|
a471824507
|
register issues
|
3 years ago |
Mirza.Shafique
|
fa986476ee
|
feedback status bar
|
3 years ago |
|
haroon amjad
|
e82b8d4439
|
Lakum & other fixes
|
3 years ago |
|
haroon amjad
|
f029aaa1c6
|
Fixes & code optimizations
|
3 years ago |
|
Mohammad Aljammal
|
f9e33e7212
|
Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0
See merge request Cloud_Solution/diplomatic-quarter!467
|
3 years ago |
|
Mohammad Aljammal
|
60d2496f0a
|
Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design
See merge request Cloud_Solution/diplomatic-quarter!472
|
3 years ago |
Mohammad Aljammal
|
f424315a19
|
last commit 😄
|
3 years ago |
|
Mohammad Aljammal
|
d4283c0116
|
fix merge issue
|
3 years ago |
|
Mohammad Aljammal
|
4cb63e353b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs
Conflicts:
lib/pages/pharmacies/screens/product-details/product-detail.dart
|
3 years ago |
|
Fatimah Alshammari
|
9cececf3f1
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
3 years ago |
|
Fatimah Alshammari
|
044f74865e
|
fixed issues
|
3 years ago |
|
haroon amjad
|
5692bc66a9
|
Removing anatomy pub from project
|
3 years ago |
|
hussam al-habibeh
|
bc91b9ad88
|
bottom nav pharmacy
|
3 years ago |
|
haroon amjad
|
668d725b25
|
Laser booking
|
3 years ago |
Elham Rababh
|
c97c39ea11
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Oct_fixes
Conflicts:
lib/config/config.dart
lib/pages/pharmacies/screens/cart-page/select_payment_option_widget.dart
|
3 years ago |
|
haroon amjad
|
fa5fd8e323
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
3 years ago |
|
haroon amjad
|
0853ecdc27
|
Body added
|
3 years ago |
mosazaid
|
4939fe63d1
|
pharmacy cart fixe counter
|
3 years ago |
|
haroon amjad
|
0c2e3f772b
|
Merge branch 'mirza_home_page' into 'development_new_design_2.0'
Mirza home page
See merge request Cloud_Solution/diplomatic-quarter!468
|
3 years ago |
|
Mirza.Shafique
|
f547dc105c
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
Mirza.Shafique
|
69db41364f
|
icon fixs
|
3 years ago |
|
Fatimah Alshammari
|
42e74759e4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
|
3 years ago |
|
haroon amjad
|
62974b7b72
|
Updates & fixes
|
3 years ago |
|
Fatimah Alshammari
|
e6378b7ada
|
fix issues
|
3 years ago |
|
Elham Rababh
|
616748dc6f
|
fix proceed button
|
3 years ago |
Zohaib Iqbal Kambrani
|
94a5cac27d
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
LiveCare Schedule fixes
improvements.
live care design 3.0
dialog ui changes in wallet & improvements.
LiveCare Schedule API fix
live care design 2.0
Health converters UI done
Health Calculators APIs updated
Translation updates
SessionID update
live care design 1.0
Updates & fixes
blood sugar dialog improvement.
# Conflicts: Rseloved
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
9d71793e88
|
no message
|
3 years ago |
|
haroon amjad
|
57ea450662
|
LiveCare Schedule fixes
|
3 years ago |
 Sikander Saleem
|
455f65a5e5
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
d2223da3c2
|
improvements.
|
3 years ago |
|
Mirza.Shafique
|
f56ae8ff5b
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
3 years ago |
|
Mirza.Shafique
|
6af1747f12
|
live care design 3.0
|
3 years ago |
|
Sikander Saleem
|
8c27773f7f
|
Merge branch 'new_design_sikander' into development_new_design_2.0
|
3 years ago |
|
Sikander Saleem
|
40c63ae53b
|
dialog ui changes in wallet & improvements.
|
3 years ago |
|
Mirza.Shafique
|
a805273049
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
4a8fc38626
|
live care design 2.0
|
3 years ago |
|
haroon amjad
|
2a212149ed
|
Health converters UI done
|
3 years ago |
|
haroon amjad
|
73822300f9
|
Health Calculators APIs updated
|
3 years ago |
|
haroon amjad
|
7123ed34ab
|
Translation updates
|
3 years ago |
|
Mirza.Shafique
|
cacdd5907c
|
Merge branch 'mirza_home_page' into development_new_design_2.0
|
3 years ago |
|
Mirza.Shafique
|
fd26a59b2d
|
live care design 1.0
|
3 years ago |
|
haroon amjad
|
5e5f540431
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
3 years ago |
|
haroon amjad
|
b08dfb117c
|
Updates & fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
4c5b9b4244
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
Translation update
Fixes & updates
Blood donation fixes
Pharmacy Payment method design fix, Blood Donation fix
improvements
blood donation dialog change & improvements.
Pharmacy updates
Pharmacy prescriptions page design
LiveCare design fixes
|
3 years ago |
|
Zohaib Iqbal Kambrani
|
9fd2304d33
|
tamara.
|
3 years ago |
|
Sikander Saleem
|
c1ce3a0489
|
blood sugar dialog improvement.
|
3 years ago |
|
Elham Rababh
|
2c30b5a494
|
fix issues
|
3 years ago |
|
Fatimah Alshammari
|
c242910aa2
|
fixed issues
|
3 years ago |
|
haroon amjad
|
b53d912996
|
Fixes & updates
|
3 years ago |
|
haroon amjad
|
df7d8a8603
|
Blood donation fixes
|
3 years ago |
|
haroon amjad
|
924f685342
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/pages/Blood/blood_donation.dart
|
3 years ago |
|
haroon amjad
|
ddf764897a
|
Pharmacy Payment method design fix, Blood Donation fix
|
3 years ago |
|
Sikander Saleem
|
ebb4c026c6
|
improvements
|
3 years ago |
|
Sikander Saleem
|
d8476df6dd
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
# lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
|
3 years ago |
|
Sikander Saleem
|
4858f8883a
|
blood donation dialog change & improvements.
|
3 years ago |
|
Fatimah Alshammari
|
428791c725
|
fixed design
|
3 years ago |
|
Fatimah Alshammari
|
5e75860d43
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/pharmacies/screens/cart-order-page.dart
# lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
|
3 years ago |