devmirza121
|
e13d64dbf7
|
Merge branch 'development_new_design_2.0' into mirza_home_page
|
4 years ago |
devmirza121
|
0b8600605b
|
Health Calculator 1.0
|
4 years ago |
haroon amjad
|
894cc0e336
|
Updates & fixes
|
4 years ago |
haroon amjad
|
e1e31de818
|
Lakum fixes
|
4 years ago |
haroon amjad
|
72784f68b9
|
Fixes & updates
|
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
|
585e26b091
|
Registration fix
|
4 years ago |
Mirza.Shafique
|
fa986476ee
|
feedback status bar
|
4 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
|
4 years ago |
Elham Rababh
|
d486b76116
|
fix merge issue
|
4 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
|
4 years ago |
haroon amjad
|
fa5fd8e323
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
0853ecdc27
|
Body added
|
4 years ago |
Mirza.Shafique
|
69db41364f
|
icon fixs
|
4 years ago |
Elham Rababh
|
616748dc6f
|
fix proceed button
|
4 years ago |
Mirza.Shafique
|
6af1747f12
|
live care design 3.0
|
4 years ago |
Mirza.Shafique
|
4a8fc38626
|
live care design 2.0
|
4 years ago |
haroon amjad
|
5e5f540431
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
4 years ago |
haroon amjad
|
b08dfb117c
|
Updates & fixes
|
4 years ago |
Zohaib Iqbal Kambrani
|
9fd2304d33
|
tamara.
|
4 years ago |
haroon amjad
|
6f92a093ab
|
Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
# lib/config/config.dart
|
4 years ago |
haroon amjad
|
1fff2dad25
|
Smartwatch updates
|
4 years ago |
Zohaib Iqbal Kambrani
|
aad071ac67
|
Packages and Offers apply token
|
4 years ago |
haroon amjad
|
d409875741
|
Smartwatch updates
|
4 years ago |
haroon amjad
|
2062b96652
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
haroon amjad
|
3db4094585
|
Ereferral fixed, HHC moved to new APIs, Notification new design implemented
|
4 years ago |
Mirza.Shafique
|
a766c2522e
|
Child Vaccine 1.0
|
4 years ago |
haroon amjad
|
4b0382d7c4
|
Merge branch 'development_new_design_2.0' into haroon-new-design
|
4 years ago |
Mirza.Shafique
|
a273bacc17
|
design fixes 1.1
|
4 years ago |
haroon amjad
|
75d3751719
|
Offers API
|
4 years ago |
Sikander Saleem
|
14ccae993e
|
my tracker tabs switching issue fixed.
|
4 years ago |
Mirza.Shafique
|
4cf9a9b2c2
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
Mirza.Shafique
|
3dbef4095f
|
Payment page design
|
4 years ago |
Sikander Saleem
|
ba4792cd38
|
merge improvements.
|
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
|
5f963b0327
|
Translation updates, CMC, HHC & RRT APIs updates
|
4 years ago |
Sikander Saleem
|
0b4305de03
|
all dialog changes and improvements (cont).
|
4 years ago |
Sultan Khan
|
a39658206d
|
my family
|
4 years ago |
Sikander Saleem
|
ad98dfce67
|
Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
# lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
|
4 years ago |
Sikander Saleem
|
1223ab7a17
|
h20 week & month graph updated & improvements.
|
4 years ago |
haroon amjad
|
e62e3dae1b
|
CMC APIs coverting to RC
|
4 years ago |
Mirza.Shafique
|
d48a4ff4e3
|
Back Button on Landing Page
|
4 years ago |
haroon amjad
|
22c6a8ce42
|
no message
|
4 years ago |
Sultan Khan
|
5fe0214e04
|
bug fixes
|
4 years ago |
Sultan Khan
|
08933632d3
|
tracker services done rrt in progress
|
4 years ago |
hussam al-habibeh
|
dbf7ebf287
|
fix most viewed & best sellers moduls
|
4 years ago |
Sultan Khan
|
c54146b3ba
|
sechedule fix
|
4 years ago |
Sultan Khan
|
d535cb421d
|
bug fixes
|
4 years ago |
Sultan Khan
|
2ebfdcfdd7
|
login issue fixed
|
4 years ago |