0
1
Fork 0
Commit Graph

746 Commits

Author SHA1 Message Date
Guillermo Bonet 6e1613a26c Merge branch '7039-country-country' of https://gitea.verdnatura.es/verdnatura/hedera-web into 7039-country-country 2024-05-07 14:05:45 +02:00
Guillermo Bonet 359ddb5d18 Fix 2024-05-07 14:05:44 +02:00
Guillermo Bonet d75fe3fc00 Merge branch 'dev' into 7039-country-country 2024-05-07 11:54:14 +00:00
Guillermo Bonet e6cd88ee82 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/hedera-web into test 2024-05-07 13:53:37 +02:00
Guillermo Bonet a405cba00b Version increased 2024-05-07 13:53:36 +02:00
Guillermo Bonet e4f55ca9e9 Merge pull request 'dev → test' (!58) from dev into test
Reviewed-on: verdnatura/hedera-web#58
2024-05-07 11:51:00 +00:00
Robert Ferrús d8ea9134d4 feat: refs #7039 change country to name 2024-05-07 07:29:00 +02:00
Guillermo Bonet a96859b6bb Merge pull request 'refactor: refs #7258 Deleted dependences of vn2008' (!56) from 7258-byeViewsVn2008 into dev
Reviewed-on: verdnatura/hedera-web#56
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-05-02 07:55:34 +00:00
Guillermo Bonet e210a09f6b Merge branch 'dev' into 7258-byeViewsVn2008 2024-04-24 08:16:20 +00:00
Guillermo Bonet 5304a77f94 Merge branch 'test' into dev 2024-04-24 10:06:48 +02:00
Guillermo Bonet 3f63da06f1 fix: refs #6492 Version increased 2024-04-24 10:00:25 +02:00
Guillermo Bonet 7d120598bc refactor: refs #7258 Deleted dependences of vn2008 2024-04-24 07:55:52 +02:00
Juan Ferrer 4cf91140f7 Merge pull request '#6492 replace procedure' (!55) from 6492-useAgencyVolume into master
Reviewed-on: verdnatura/hedera-web#55
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-04-23 14:08:14 +00:00
Jorge Penadés 06554b7dee fix: refs #6492 replace procedure 2024-04-23 12:02:04 +02:00
Juan Ferrer 83c6886ee6 feat(catalog): refs #7222 Set image aspect ratio to 1:1 2024-04-17 10:10:40 +02:00
Jorge Penadés 4765bc78de Merge pull request 'feat: refs #6492 replace procedure' (!54) from 6492-replaceAgencyVolume into dev
Reviewed-on: verdnatura/hedera-web#54
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-04-12 06:49:16 +00:00
Jorge Penadés 0a9635feb2 feat: refs #6492 replace procedure 2024-04-10 12:41:45 +02:00
Jorge Penadés 00c8e4b1e3 feat: refs #6492 replace procedure 2024-04-10 12:35:44 +02:00
Guillermo Bonet 1414b6c96e refactor: refs #5167 Version increased 2024-03-21 07:15:28 +01:00
Guillermo Bonet 244b3f939e Merge pull request 'refactor: refs #5167 Deleted provinces section' (!51) from 5167-removedProvince into master
Reviewed-on: verdnatura/hedera-web#51
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-03-21 06:03:58 +00:00
Guillermo Bonet 1d2f9061c5 refactor: refs #5167 Requested changes 2024-03-11 13:23:07 +01:00
Guillermo Bonet a121750fa7 refactor: refs #5167 Deleted provinces section 2024-03-11 08:52:43 +01:00
Guillermo Bonet 73ba16634e refactor: refs #5167 Deleted provinces section 2024-03-11 08:50:35 +01:00
Juan Ferrer 2515cbcee7 ci: HOTFIX Use version to tag docker images 2024-02-22 09:41:39 +01:00
Juan Ferrer d1cdba800d Jenkinsfile refactor 2024-02-22 09:25:38 +01:00
Juan Ferrer 02ddc87755 version increased 2024-02-22 09:03:28 +01:00
Juan Ferrer 7689be689f Merge branch 'master' into test 2024-02-22 08:56:16 +01:00
Juan Ferrer 33778629e6 Merge pull request 'dev' (!49) from dev into test
Reviewed-on: verdnatura/hedera-web#49
2024-02-15 12:35:15 +00:00
Juan Ferrer 7f1d8ebb8e version updated 2024-02-15 13:34:20 +01:00
Juan Ferrer 4d8a67f499 Merge pull request 'test' (!48) from test into dev
Reviewed-on: verdnatura/hedera-web#48
2024-02-15 12:32:01 +00:00
Guillermo Bonet c6120af93b Merge pull request 'refactor: refs #6780 Deleted references to warehouse vn2008' (!47) from 6780-changeViewDependencesVn2008 into dev
Reviewed-on: verdnatura/hedera-web#47
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-02-02 08:16:55 +00:00
Guillermo Bonet 95f819c22f refactor: refs #6780 Deleted references to warehouse vn2008 2024-02-01 09:46:16 +01:00
Juan Ferrer 496061fb3c refs #6200 Version increased 2023-10-10 14:17:50 +02:00
Juan Ferrer 0b85c1230a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/hedera-web 2023-10-10 12:46:42 +02:00
Juan Ferrer 3ed871cb4c refs #6200 fix 2023-10-10 12:46:05 +02:00
Juan Ferrer c7159a1e13 Merge pull request 'refs #6200 test into master' (!46) from test into master
Reviewed-on: verdnatura/hedera-web#46
2023-10-10 08:21:49 +00:00
Juan Ferrer fba880fb33 refs #6200 Version increased 2023-10-10 09:37:29 +02:00
Juan Ferrer 1535a557a8 refs #6200 Fixes: style & add to basket 2023-10-09 21:08:40 +02:00
Juan Ferrer 4a09fe39a8 refs #6200 style fixes, mock local date 2023-10-09 21:01:11 +02:00
Juan Ferrer 3977b258d3 refs #6200 Style fixes 2023-10-09 20:20:01 +02:00
Juan Ferrer 6915e06c71 refs #6200 Minimal amount 2023-10-09 19:51:59 +02:00
Juan Ferrer a474f9df05 Merge branch 'master' into test 2023-10-09 19:06:44 +02:00
Juan Ferrer 620bd53262 refs #5879 Fixes: PHP max upload filesize 2023-08-30 17:48:23 +02:00
Juan Ferrer 8f98597ea2 refs #5863 Fixes: Mailer, logout & run db 2023-08-21 11:41:51 +02:00
Alex Moreno a2cd8a711e Merge pull request 'refs #5762 feat(changePassword): salix compatibility' (!44) from 5762-recover-password_salix2 into test
Reviewed-on: verdnatura/hedera-web#44
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-08-18 06:57:15 +00:00
Alex Moreno 08b4a3437c refs #5762 feat(changePassword): salix compatibility 2023-08-07 07:25:11 +02:00
Juan Ferrer a59c44fb3a refs #5863 Version increased 2023-08-02 08:49:49 +02:00
Juan Ferrer 2adfd2299a Merge pull request 'hotFix(logout): correct order' (!43) from hotFix_correctOrder_logout into master
Reviewed-on: verdnatura/hedera-web#43
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-07-28 11:25:16 +00:00
Juan Ferrer f929e67d76 Merge branch 'master' into hotFix_correctOrder_logout 2023-07-28 11:24:56 +00:00
Juan Ferrer d37493b081 ticket #097414 Fix: Use client language 2023-07-28 13:11:33 +02:00