Fatimah Alshammari
|
e5829d8513
|
fix recommended for you
|
4 years ago |
|
Fatimah Alshammari
|
42bf76f712
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/config/config.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
|
4 years ago |
|
Fatimah Alshammari
|
ac32ba998c
|
fixed order isuee
|
4 years ago |
hussam al-habibeh
|
8c58dced7d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
Conflicts:
lib/core/service/pharmacy_categorise_service.dart
lib/pages/final_products_page.dart
|
4 years ago |
|
hussam al-habibeh
|
1b76d9c192
|
pharmacy bugs fixed
|
4 years ago |
mosazaid
|
125dd27a00
|
Merge branch 'development' into fix-pharmacy
|
4 years ago |
|
mosazaid
|
5d0a122689
|
fix bugs
|
4 years ago |
Mohammad Aljammal
|
e6da54c201
|
Merge branch 'development' 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
|
4 years ago |
|
Mohammad Aljammal
|
20ad10b9dc
|
Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
8899bdf460
|
Done Prescription Delivery Address
|
4 years ago |
|
mosazaid
|
d02b74142a
|
Merge branch 'development' into fix-pharmacy
# Conflicts:
# lib/core/service/client/base_app_client.dart
|
4 years ago |
|
mosazaid
|
1a45f99606
|
some fixes on pharmacy
|
4 years ago |
haroon amjad
|
5e8e3806d6
|
Covid Drive-Thru implemented
|
4 years ago |
|
haroon amjad
|
ba10014b46
|
Merge branch 'development' into Haroon
|
4 years ago |
|
Mohammad Aljammal
|
0098345d05
|
add Prescription Delivery Address Page amd fix the Authentication Pharmacy
|
4 years ago |
|
haroon amjad
|
83cca264f1
|
Merge branch 'LamaHerbish' into Haroon
|
4 years ago |
HMG\Lama.Herbish
|
031be1ac56
|
fixes
|
4 years ago |
|
haroon amjad
|
f72c860516
|
Merge branch 'development' into Haroon
|
4 years ago |
Mohammad Aljammal
|
87ad027d33
|
Merge branch 'improve_hhc' into 'development'
Improve hhc
See merge request Cloud_Solution/diplomatic-quarter!264
|
4 years ago |
|
haroon amjad
|
13f6015cf0
|
Merge branch 'development' into Haroon
|
4 years ago |
|
haroon amjad
|
69649ff7f8
|
added verified icon in homepage when patient is logged in
|
4 years ago |
|
Mohammad Aljammal
|
29f4e6acb6
|
Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing
See merge request Cloud_Solution/diplomatic-quarter!262
|
4 years ago |
|
haroon amjad
|
9ecf745747
|
fixes
|
4 years ago |
|
haroon amjad
|
b6c617888b
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
|
Fatimah Alshammari
|
ef8312f2b8
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/core/service/parmacyModule/prescription_service.dart
# lib/pages/pharmacies/product_detail.dart
|
4 years ago |
|
Fatimah Alshammari
|
ce64da11e4
|
homepage and product details design
|
4 years ago |
|
mosazaid
|
cbe422cbc6
|
Merge branch 'hmg-services-fixing' into development
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
0444b21101
|
Merge branch 'development' into hmg-services-fixing
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Elham Rababah
|
94ee969406
|
hhc msg translation
|
4 years ago |
|
Elham Rababah
|
8a1924cca2
|
fix images in hhc
|
4 years ago |
|
Mohammad Aljammal
|
e964afd4f2
|
Merge branch 'fix_security_issue' into 'development'
fix security issues in pharmacy
See merge request Cloud_Solution/diplomatic-quarter!261
|
4 years ago |
|
Mohammad Aljammal
|
d477481856
|
fix security issues in pharmacy
|
4 years ago |
|
Mohammad Aljammal
|
63657cb7c4
|
Merge branch 'h2o_improvement' into 'development'
H2O feature, setting page added
See merge request Cloud_Solution/diplomatic-quarter!260
|
4 years ago |
 Sikander Saleem
|
e40ad85d61
|
H2O feature, setting page added
|
4 years ago |
|
Mohammad Aljammal
|
1d724a8db6
|
Merge branch 'h2o_improvement' into 'development'
H2o improvement
See merge request Cloud_Solution/diplomatic-quarter!259
|
4 years ago |
|
Sikander Saleem
|
bd062150c1
|
H2O feature improvement
|
4 years ago |
|
Sikander Saleem
|
aef4c7bfac
|
H2O feature improvement
|
4 years ago |
|
haroon amjad
|
0b83089b86
|
Merge branch 'development' into Haroon
|
4 years ago |
|
haroon amjad
|
3832cee1ad
|
Translation fixes
|
4 years ago |
|
Sikander Saleem
|
3b4e791017
|
H2O feature improvement
|
4 years ago |
|
Mohammad Aljammal
|
bb42647c91
|
Merge branch 'development' into 'fix_pharmacy'
# Conflicts:
# lib/pages/login/login.dart
|
4 years ago |
|
Mohammad Aljammal
|
ab53ca82b1
|
fix colors issues
|
4 years ago |
|
mosazaid
|
822defbd04
|
working on bmi calculator design and functionality
|
4 years ago |
|
haroon amjad
|
3bad0a3804
|
Merge branch 'development' into Haroon
|
4 years ago |
|
haroon amjad
|
146019432a
|
LiveCare schedule implemented
|
4 years ago |
|
Sikander Saleem
|
8f37fbf260
|
Qr icon added, notify me api added & improvements
|
4 years ago |
|
Mohammad Aljammal
|
3e441c55b2
|
fix bottom nav bar
|
4 years ago |
|
Mohammad Aljammal
|
9d8c1ddf63
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
Conflicts:
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
484cca086e
|
fix my my Trackers
|
4 years ago |
|
haroon amjad
|
ab158e14e9
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |