cd7ed6987a
Merge pull request 'fix: refs #7283 remove' (!2907) from 7283-itemsMigration3 into dev
b0812139cb
Merge branch '7283-itemsMigration3' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
155616e622
Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
e498cbd060
Merge branch 'dev' into 7283-itemsMigration3
f552a3b7e1
Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
b0812139cb
Merge branch '7283-itemsMigration3' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
155616e622
Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
782563f67d
Merge branch 'test' into dev
aa1c017f22
fix: refs #7779 ticket_splitItemPackingType
021bc03ecf
Merge pull request 'feat: refs #8169 create table itemTextureTag' (!3155) from 8169-itemTextureTag into master
carlossa
pushed to 7310-warningTravelTermographs at verdnatura/salix-front
2024-11-14 07:35:30 +00:00
a115caac71
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7310-warningTravelTermographs
483760c8cd
Merge pull request '#7132 fix translations' (!843) from 7132-FixTranslations into dev
f9ef50db02
Merge branch 'dev' into 7132-FixTranslations
c2b6b816a4
fix: refs #7283 Account image resolution
540e0348a1
Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations
carlossa
pushed to 7310-warningTravelTermographs at verdnatura/salix-front
2024-11-13 13:07:54 +00:00
9e653b8c2d
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7310-warningTravelTermographs
7dba1a1846
Merge pull request 'feat: refs #6818 add icon' (!924) from 6818-addIcon into dev
9291c4dd6a
feat: refs #6818 add icon
d474fb924f
Merge pull request 'feat: refs #6818 saysimple integration' (!904) from 6818-saySimpleIntegration into dev
96e9de519f
Merge branch 'dev' into 6818-saySimpleIntegration
bafb2621ab
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4774-traducciones
d474fb924f
Merge pull request 'feat: refs #6818 saysimple integration' (!904) from 6818-saySimpleIntegration into dev
96e9de519f
Merge branch 'dev' into 6818-saySimpleIntegration
1f8ead608c
Merge pull request 'feat(VnSelect): order data equal salix' (!918) from warmFix_order_equalSalix into dev
2ae9d68fec
Merge branch 'dev' into warmFix_order_equalSalix
ac92a10167
Merge branch 'dev' of https: refs #4774//gitea.verdnatura.es/verdnatura/salix into 4774-translationsVn
172b4d8e05
Merge branch 'test' into dev
1086981b53
fix: refs #7779 ticket_splitItemPackingType
968e308ab6
Merge pull request 'feat: refs #6818 saysimple integration' (!3168) from 6818-saySimpleIntegration into dev
f52041eeff
Merge branch 'dev' into 6818-saySimpleIntegration
d8ae6c056e
Merge pull request 'fix: fix termo' (!915) from hotfix-termog into master
fefa61ea5c
fix: fix termo
b91cce5dd0
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7790_formFocus_mixin
e21087e645
Merge pull request 'feat(Supplier): add companySize' (!906) from 6828-supplier_companySize into dev
777ac58f04
feat(Supplier): add companySize