Zohaib Iqbal Kambrani
|
ff508de9f7
|
Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
Updates & fixes
# Conflicts: resolved
# lib/pages/medical/balance/confirm_payment_page.dart
|
4 years ago |
haroon amjad
|
aa36154764
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal
|
364ff3344a
|
Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/login/register-info.dart
# lib/pages/medical/balance/confirm_payment_page.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
940a19d4d7
|
Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
ancillary orders update
Updates & fixes
fix category issue
fixes & updates
lakum fix
Updates & fixes
fix translation issue
Compare duplication fixed
Updates & fixes
Updates & fixes
fix compare issue
pharmacy fixes
fix categories & cantact design
pharmacy fixes
Updates & fixes
fix conflict
Updates & fixes
Updates & fixes
Login fixes
# Conflicts: Resolved
# lib/pages/BookAppointment/QRCode.dart
# lib/pages/BookAppointment/SearchResults.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
d974a7430c
|
Google Analytics as per e-Cense document
|
4 years ago |
haroon amjad
|
19dadd2b35
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
haroon amjad
|
a6c6651363
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal
|
259e27d4a7
|
Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
# lib/pages/landing/fragments/home_page_fragment2.dart
# lib/uitl/app_shared_preferences.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
ab8b62bc3a
|
Packages and offers fixes, HMG Internet work in progress,
|
4 years ago |
haroon amjad
|
0acc134e6e
|
Updates & fixes
|
4 years ago |
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
|
1f19af01c4
|
Merge branch 'development_v2.5' into haroon_development_2.5
|
4 years ago |
haroon amjad
|
c175139a29
|
pharmacy fixes
|
4 years ago |
Fatimah Alshammari
|
71a28e2ed6
|
Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
|
4 years ago |
Fatimah Alshammari
|
cc783045bb
|
fix categories & cantact design
|
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
|
216cc4a7e3
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
d767febcd0
|
fix search issue
|
4 years ago |
haroon amjad
|
9c0337aa01
|
updates & fixes
|
4 years ago |
haroon amjad
|
330f2d6c86
|
Fixes & updates
|
4 years ago |
Sikander Saleem
|
628439ddf8
|
video call camera view issue fix, barcode plugin change, smart watches improvements.
|
4 years ago |
haroon amjad
|
207525e31a
|
Fixes
|
4 years ago |
haroon amjad
|
302e9dbadd
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Sikander Saleem
|
e3bf988df5
|
map picker, firebase improvement and changes for v2.5
|
4 years ago |
Fatimah Alshammari
|
a55ca33c1b
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
# lib/pages/search_products_page.dart
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
Fatimah Alshammari
|
bc9fc5a878
|
fix issue
|
4 years ago |
haroon amjad
|
b0ae08d6a5
|
updates & fixes
|
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
|
333b41632c
|
fixes
|
4 years ago |
Fatimah Alshammari
|
a2a6da1527
|
Merge branch 'development_new_design_2.0' into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
5dc1561992
|
fixed notify issue
|
4 years ago |
haroon amjad
|
a646677fae
|
Pharmacy & smart watch data fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
3bd94ee05e
|
Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
fix issues
Base app client updates
prescription reminders added
Medical Reminder 1.0
lakum fixes
Medical Reminder
|
4 years ago |
Zohaib Iqbal Kambrani
|
b596b1b61d
|
WebRTC and Packages Offer | Merge
|
4 years ago |
haroon amjad
|
7ffc467552
|
Lakum fixes
|
4 years ago |
haroon amjad
|
ab7162f164
|
Base app client updates
|
4 years ago |
haroon amjad
|
68294690a1
|
prescription reminders added
|
4 years ago |
haroon amjad
|
61a406085b
|
lakum fixes
|
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 |
haroon amjad
|
f533dd5356
|
Merge branch 'nov_fixes' into 'development_new_design_2.0'
fix cart order page
See merge request Cloud_Solution/diplomatic-quarter!515
|
4 years ago |
Elham Rababh
|
6ff829ab91
|
fix cart order page
|
4 years ago |
hussam al-habibeh
|
80c6be239e
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
Conflicts:
lib/pages/sub_categorise_page.dart
|
4 years ago |
hussam al-habibeh
|
300668cc81
|
sub Categorise fixed
|
4 years ago |
haroon amjad
|
d630c6c45f
|
Pharmacy fixes
|
4 years ago |
Haroon Amjad
|
464ad9a3cb
|
Shopping cart fix
|
4 years ago |
haroon amjad
|
67b6fd4ab6
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
7a8ed5b014
|
Total amount calculation 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 |
Fatimah Alshammari
|
f5de786745
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
haroon amjad
|
3ec2f990b1
|
product detail page updates
|
4 years ago |
Fatimah Alshammari
|
c4e185ea60
|
fixed issues
|
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 |
haroon amjad
|
6ffa07392c
|
Product detail page updates
|
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
|
ea745f1b9f
|
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
|
502c7fd3de
|
Offers & discounts UI updating
|
4 years ago |
Fatimah Alshammari
|
ce0dff11b2
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Haroon Amjad
|
d5c68c5032
|
Packages & offers design
|
4 years ago |
haroon amjad
|
b752b42a34
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
77c8c85e88
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
haroon amjad
|
9ce77b56b9
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Fatimah Alshammari
|
ca11fe3134
|
fix issues
|
4 years ago |
haroon amjad
|
30e67bbe3e
|
updates
|
4 years ago |
Fatimah Alshammari
|
239d2c1036
|
Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
|
4 years ago |
Fatimah Alshammari
|
23acdfd494
|
fix loader issue and design
|
4 years ago |
haroon amjad
|
894cc0e336
|
Updates & fixes
|
4 years ago |
Fatimah Alshammari
|
6f63250252
|
fix issues
|
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 |
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
|
4 years ago |
Mohammad Aljammal
|
c0cf2f71a2
|
Merge branch 'bottom_nav_pharmacy' into 'development'
Bottom nav pharmacy
See merge request Cloud_Solution/diplomatic-quarter!478
|
4 years ago |
Mirza.Shafique
|
fa986476ee
|
feedback status bar
|
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 |
Mohammad Aljammal
|
d4283c0116
|
fix merge issue
|
4 years ago |