haroon amjad
|
454957ebba
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
|
4 years ago |
Sultan Khan
|
616212828d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
66acce3b40
|
ancillary order pages added
|
4 years ago |
|
haroon amjad
|
e0ebb922ed
|
pharmacy fixes
|
4 years ago |
|
haroon amjad
|
ed3dba3eb3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
haroon amjad
|
b9a12341d5
|
updates & fixes
|
4 years ago |
Mohammad Aljammal
|
861dba9a94
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
ec401d4848
|
Done Ed online
|
4 years ago |
|
Sultan Khan
|
a6196d3c30
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
b891c1bd80
|
theme issue
|
4 years ago |
Fatimah Alshammari
|
747763c4be
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
4 years ago |
|
Sultan Khan
|
1a35fe37b6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
|
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
|
1a45f99606
|
some fixes on pharmacy
|
4 years ago |
|
haroon amjad
|
5e8e3806d6
|
Covid Drive-Thru implemented
|
4 years ago |
|
Sultan Khan
|
144ef52c70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
Sultan Khan
|
b3e6c4efda
|
voice command changes
|
4 years ago |
|
mosazaid
|
b70c7d7d05
|
fix pharmacy auth
|
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 |
|
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
|
b6c617888b
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/localized_values.dart
|
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 |
|
Sultan Khan
|
d33918c932
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
 Sikander Saleem
|
aef4c7bfac
|
H2O feature improvement
|
4 years ago |
|
haroon amjad
|
3832cee1ad
|
Translation fixes
|
4 years ago |
|
Sikander Saleem
|
3b4e791017
|
H2O feature improvement
|
4 years ago |
|
mosazaid
|
822defbd04
|
working on bmi calculator design and functionality
|
4 years ago |
|
Sultan Khan
|
3ac69692be
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
|
haroon amjad
|
7c538b350f
|
LiveCare Scheduling finalized, Appointments in ToDo list categorized
|
4 years ago |
hussam al-habibeh
|
b767748315
|
health-converter fix
|
4 years ago |
|
hussam al-habibeh
|
97919c217f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
hussam al-habibeh
|
1ce0ef7b6c
|
health-converter fix
|
4 years ago |
|
Mohammad Aljammal
|
db2376f50c
|
fix blood and weight on my trackers
|
4 years ago |
|
Sultan Khan
|
ccd2fc5068
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
|
mosazaid
|
38d52b52c8
|
Merge branch 'development' into fix_design
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
|
4 years ago |
|
mosazaid
|
174534d8a5
|
fix Blood donation functionality and design
|
4 years ago |
|
Mohammad Aljammal
|
405f67be1e
|
Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!249
|
4 years ago |
|
Fatimah Alshammari
|
7a516cae51
|
Merge branch 'development' into pharmacy-Fatima
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
|
4 years ago |
|
Mohammad Aljammal
|
f883e1bd78
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
Conflicts:
lib/config/localized_values.dart
|
4 years ago |
|
Mohammad Aljammal
|
0b1014a91c
|
fix blood sugar service on my tracker
|
4 years ago |