Mohammad Aljammal
|
16d1f667d4
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/pages/pharmacy/profile/profile.dart
lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
mosazaid
|
38d58ebaaf
|
Merge branch 'pharmacy' into pharmacy_mosa_branch
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
# lib/services/pharmacy_services/pharmacyAddress_service.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
enadhilal
|
10734d5994
|
connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
|
5 years ago |
Fatimah Alshammari
|
c0920e7099
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
Fatimah Alshammari
|
e5bf7acc52
|
Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
# Conflicts:
# lib/core/viewModels/pharmacyModule/order_model_view_model.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
Fatimah Alshammari
|
fda101840a
|
fixed order isuues
|
5 years ago |
mosazaid
|
359eba2da0
|
make some updates in firebase version and update gradle, finish review order
|
5 years ago |
Fatimah Alshammari
|
4a84483698
|
fixed order details
|
5 years ago |
mosazaid
|
6ac8d67b83
|
finish address add/edit/delete/select
|
5 years ago |
enadhilal
|
727940c5c6
|
fixed merging issues
|
5 years ago |
enadhilal
|
9c55571072
|
Merge branch 'pharmacy' into enad_pharmacy2
|
5 years ago |
enadhilal
|
c22ca4e29e
|
Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
enadhilal
|
888a74fb9b
|
add these pages
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
|
5 years ago |
Fatimah Alshammari
|
706980248a
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
|
5 years ago |
Fatimah Alshammari
|
9b8103bfd6
|
fixe order and order details
|
5 years ago |
hussam al-habibeh
|
a1906a4072
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
5 years ago |
umasoodch
|
b5413d1749
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
hussam al-habibeh
|
64cbae3602
|
Search
|
5 years ago |
mosazaid
|
35d0d3e441
|
finsi lakum points task
|
5 years ago |
Elham Rababah
|
ea195ea9bf
|
Finish translate CMC HHC
|
5 years ago |
mosazaid
|
98f660e29b
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
mosazaid
|
4e5d6a9a00
|
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
|
5 years ago |
umasoodch
|
0431eb1ac8
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
|
5 years ago |
haroon amjad
|
6846a8501a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
haroon amjad
|
0181043da8
|
Ereferral fixes, smartwatch health data integration
|
5 years ago |
Mohammad Aljammal
|
2185f5ce11
|
Merge branch 'hhc_cmc' into 'master'
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!138
|
5 years ago |
Elham Rababah
|
05deaa6322
|
Address Added Successfully
|
5 years ago |
Mohammad Aljammal
|
54d8965773
|
done child Vaccination
|
5 years ago |
haroon amjad
|
97b8aeeff5
|
Version Control finished
|
5 years ago |
Mohammad Aljammal
|
a556e8c1f8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/config.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
|
5 years ago |
Mohammad Aljammal
|
b504f379de
|
fix lab result translations and colors
|
5 years ago |
Mohammad Aljammal
|
0ac599ea1c
|
fix vital Sign
|
5 years ago |
Sultan Khan
|
6bbdf05f90
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
857fc813cd
|
button feedback
|
5 years ago |
haroon amjad
|
d284ceac04
|
advance payment & payment flow issues fixed
|
5 years ago |
Sultan Khan
|
8d499704dc
|
family file changes
|
5 years ago |
Mohammad Aljammal
|
0d098def04
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
Conflicts:
assets/app_icons/config.json
assets/app_icons/fonts/DQIcons.ttf
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/d_q_icons_icons.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/uitl/utils.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Sultan Khan
|
18a2393d92
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
6e152951b4
|
notification count
|
5 years ago |
Mohammad Aljammal
|
0966269537
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!116
|
5 years ago |
Sultan Khan
|
d2f391ab7f
|
setting page inprogress
|
5 years ago |
Sultan Khan
|
0ed29be214
|
launch
|
5 years ago |
Sultan Khan
|
30a8e24521
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
91be66ecdd
|
family file changes
|
5 years ago |
Mohammad Aljammal
|
b785f87dac
|
fix App drawer after logout
|
5 years ago |
Mohammad Aljmma
|
6523a1dea9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Mohammad Aljmma
|
a9b11a6b03
|
fix lab result
|
5 years ago |
Sultan Khan
|
3589b21590
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Mohammad Aljmma
|
ed7b9d609f
|
fix lab result
|
5 years ago |
haroon amjad
|
b81af62551
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |