haroon amjad
|
40d649dfa4
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
e5f0f5777b
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
# lib/services/pharmacy_services/product_detail_service.dart
|
4 years ago |
haroon amjad
|
6d88607631
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
57d10d9e1f
|
fix compare issue
|
4 years ago |
haroon amjad
|
c175139a29
|
pharmacy fixes
|
4 years ago |
haroon amjad
|
c05772c63a
|
pharmacy fixes
|
4 years ago |
haroon amjad
|
c2b0326676
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
3ad90f1a01
|
Merge branch 'development_new_design_2.0' into development_v2.5
|
4 years ago |
haroon amjad
|
7733c74f00
|
Updates & fixes
|
4 years ago |
Sikander Saleem
|
9ba7b3b44b
|
Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
# lib/pages/BookAppointment/BookConfirm.dart
# lib/pages/medical/smart_watch_health_data/syncHealthData.dart
# lib/pages/vaccine/my_vaccines_screen.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# pubspec.yaml
|
4 years ago |
haroon amjad
|
c379c6a37b
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
4c2410cfd5
|
Health plugin updated
|
4 years ago |
Fatimah Alshammari
|
d767febcd0
|
fix search issue
|
4 years ago |
haroon amjad
|
207525e31a
|
Fixes
|
4 years ago |
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
4 years ago |
haroon amjad
|
75423e5501
|
Updates
|
4 years ago |
hussam al-habibeh
|
141e650276
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/pages/pharmacies/screens/product-details/product-name-and-price.dart
|
4 years ago |
hussam al-habibeh
|
af0316367d
|
Merge branch 'products_tails' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
haroon amjad
|
2274c6affe
|
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!531
|
4 years ago |
haroon amjad
|
68b443905e
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!544
|
4 years ago |
Elham Rababh
|
34596163d1
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into nov_fixes
|
4 years ago |
hussam al-habibeh
|
e6fd5293ca
|
fix filited produvts API
|
4 years ago |
Elham Rababh
|
12e47aba82
|
fix as first step
|
4 years ago |
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
b596b1b61d
|
WebRTC and Packages Offer | Merge
|
4 years ago |
haroon amjad
|
87a997d156
|
Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix
See merge request Cloud_Solution/diplomatic-quarter!521
|
4 years ago |
hussam al-habibeh
|
db1820fda4
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
haroon amjad
|
79d99dd48a
|
Pharmacy security updates applied
|
4 years ago |
hussam al-habibeh
|
ff86dcbdc0
|
sub categories pagnation
|
4 years ago |
haroon amjad
|
4823919fcb
|
Pharmacy fixes
|
4 years ago |
hussam al-habibeh
|
1a382bfc80
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/config/config.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
lib/pages/pharmacies/screens/product-details/product-detail.dart
lib/pages/sub_categorise_page.dart
|
4 years ago |
hussam al-habibeh
|
a35e149088
|
product pagination
|
4 years ago |
haroon amjad
|
289e74fd0a
|
fixes
|
4 years ago |
hussam al-habibeh
|
b2b786d157
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
|
4 years ago |
hussam al-habibeh
|
5927f3e35f
|
pharmacy home page update
|
4 years ago |
haroon amjad
|
90b821a37d
|
Offers & packages UI completed
|
4 years ago |
haroon amjad
|
502c7fd3de
|
Offers & discounts UI updating
|
4 years ago |
Haroon Amjad
|
d5c68c5032
|
Packages & offers design
|
4 years ago |
haroon amjad
|
b752b42a34
|
Updates & fixes
|
4 years ago |
haroon amjad
|
30e67bbe3e
|
updates
|
4 years ago |
haroon amjad
|
894cc0e336
|
Updates & fixes
|
4 years ago |
haroon amjad
|
72784f68b9
|
Fixes & updates
|
4 years ago |
haroon amjad
|
be771917f0
|
pharmacy fixes
|
4 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
|
4 years ago |
Fatimah Alshammari
|
78fc77159c
|
fix lakum issues
|
4 years ago |
haroon amjad
|
8d6278a59b
|
Pharmacy fixes
|
4 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
|
4 years ago |
haroon amjad
|
fa5fd8e323
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 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
|
4 years ago |
haroon amjad
|
62974b7b72
|
Updates & fixes
|
4 years ago |