Mohammad Aljammal
|
459ba828d9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/home_page.dart
lib/pages/medical/vital_sign/vital_sign_item.dart
lib/routes.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
5 years ago |
Mohammad Aljammal
|
77dcb918c3
|
Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
|
5 years ago |
hussam al-habibeh
|
5dc3c53550
|
mousa and hussam branch
|
5 years ago |
mosazaid
|
4c9a1862d2
|
make pharmacy home page load data even without login, and some mini changes
|
5 years ago |
mosazaid
|
7ee7ef58c4
|
working on dynamic title on pharmacy
|
5 years ago |
mosazaid
|
709ba2ce97
|
create terms-condition in pharmacy order page
|
5 years ago |
mosazaid
|
2a91ae787f
|
commit
|
5 years ago |
mosazaid
|
35d0d3e441
|
finsi lakum points task
|
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
|
951c77feb5
|
working on lakum account
|
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
|
92db2b2be9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
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 |
Mohammad Aljammal
|
939840bbe7
|
fix master
|
5 years ago |
Mohammad Aljammal
|
3c1257b379
|
fix Medicine Search
|
5 years ago |
Mohammad Aljammal
|
b785f87dac
|
fix App drawer after logout
|
5 years ago |
Mohammad Aljmma
|
20ece68ddb
|
fix issue # 6 & 7 & 8
|
5 years ago |
haroon amjad
|
9868a43e7b
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
|
5 years ago |
mosazaid
|
9a169ff77b
|
finish home page and start working on order preview page
|
5 years ago |
Elham Rababah
|
fa88e9055f
|
make loader center
|
5 years ago |
enadhilal
|
7ca6e6caa7
|
fix widget of product_tile
|
5 years ago |
enadhilal
|
d6d1c26c9a
|
add product_tile widget
|
5 years ago |
enadhilal
|
068382e76f
|
add call for backend service
|
5 years ago |
enadhilal
|
815bc39268
|
add wishlist page
|
5 years ago |
hussam al-habibeh
|
e92cb2e1ac
|
Design and return Pharmacy List
|
6 years ago |
hussam al-habibeh
|
31d2816e64
|
design for search medicine and return medicine list
|
6 years ago |