Commit Graph

13457 Commits

Author SHA1 Message Date
Vicent Llopis a30f50ffe5 refactor: borrado console.log
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 12:20:27 +01:00
Joan Sanchez f6e14db9f4 Merge branch 'dev' into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-14 11:19:01 +00:00
Joan Sanchez 04eefc7dbe Merge pull request '4725-jenkins_agent' (!1141) from 4725-jenkins_agent into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1141
2022-11-14 11:17:13 +00:00
Joan Sanchez b048b5e7f4 Merge pull request 'TEST_hotfix_usesMana' (!1140) from TEST_hotfix_usesMana into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1140
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-14 11:07:46 +00:00
Joan Sanchez 55f3d26dd0 Trigger jenkins build
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-14 12:02:50 +01:00
Vicent Llopis d6a0580203 feat: traducciones modelo Ticket
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 11:08:23 +01:00
Vicent Llopis 6e94d7f68e fix: nombre variable incorrecto
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 11:00:13 +01:00
Joan Sanchez 500d12f5a0 Enabled back unit tests
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-11-14 10:13:26 +01:00
Alexandre Riera 7dd87b1ea8 refs #4700 icons future
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:56:23 +01:00
Alex Moreno 362857cce8 Merge pull request 'TEST_feat: creat email/vehicle-event-expired' (!1137) from hotFix_emailVehicleEventExpired into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1137
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-14 08:16:04 +00:00
Alexandre Riera 03ea2b4f11 refs #4700 translations
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 08:55:27 +01:00
Pau 3c771fc771 refactor missing URL's refs #4609
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 08:53:00 +01:00
Alexandre Riera 0ef64481b9 refs #4700 e2e finished
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 08:51:15 +01:00
Alex Moreno d1dce73a33 feat: creat email/vehicle-event-expired
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 08:50:38 +01:00
Alexandre Riera c16210dd8a refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 15:58:11 +01:00
Vicent Llopis 7e50f23563 refacor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:55:56 +01:00
Vicent Llopis a5b20bfb03 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing 2022-11-11 08:53:10 +01:00
Joan Sanchez 163f7fd284 Added version 10503
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:31:45 +01:00
Joan Sanchez 5e0a31f244 Merge pull request '3928-worker.time-control_sendMail' (!1129) from 3928-worker.time-control_sendMail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1129
2022-11-11 07:30:01 +00:00
Vicent Llopis 9d06f5c0f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 07:47:29 +01:00
Joan Sanchez 676f2e1584 Removed prettier from config
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 07:36:23 +01:00
Joan Sanchez b044d74106 Removed prettier
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 07:35:53 +01:00
Juan Ferrer e7f26e8502 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 00:56:20 +01:00
Juan Ferrer 5d955e1568 Merge pull request 'refs #4609' (!1134) from 4609-hotfixPackageLockDockerNpmUpdate into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1134
2022-11-10 23:32:20 +00:00
Juan Ferrer 163d704d3b refs #4609 Jasmine updated
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 00:13:57 +01:00
Juan Ferrer edc1f213c7 refs #4609 sharp updated
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 23:51:14 +01:00
Juan Ferrer c2b4187b97 refs #4609
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 23:46:03 +01:00
Juan Ferrer e4a02042a7 Merge pull request '4609-Refactor to verdnatura.es and shop.verdnatura.es' (!1072) from 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es into master
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1072
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 19:42:40 +00:00
Juan Ferrer ad741ba738 Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 20:37:11 +01:00
Alexandre Riera 117e2c03f5 refs #4700 tests back y empezando e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 15:54:00 +01:00
Pau 9004839e00 Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:53:14 +01:00
Pau 01fe8c8997 requested changes 2022-11-10 14:53:08 +01:00
Joan Sanchez 1f05e6fb3b Label without header & footer
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:50:08 +01:00
Vicent Llopis 918ea3030d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:41:12 +01:00
Alex Moreno 37d412bf3b refactor: delete unnecessary test
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:38:37 +01:00
Joan Sanchez 6a2977a2cf Fixed SQL changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:19:20 +01:00
Alex Moreno 8d731946f6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-10 13:58:18 +01:00
Joan Sanchez 02cd705fbf Merge pull request '4810-print_template' (!1133) from 4810-print_template into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1133
2022-11-10 12:56:00 +00:00
Joan Sanchez 55b90d8a80 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4810-print_template
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 13:43:04 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Joan Sanchez 800d98a5b5 Removed unused components
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 13:34:23 +01:00
Joan Sanchez 83590b3adf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 11:54:05 +01:00
Joan Sanchez 303020a731 Attachment fixes
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 11:51:14 +01:00
Joan Sanchez 133897c29f Updated templates
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 10:38:54 +01:00
Joan Sanchez 83798dfadb Email template slots
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 09:51:28 +01:00
Pau c15d40b237 Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:45:15 +00:00
Pau 2704017486 check default true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 09:43:19 +01:00
Joan Sanchez b8add5b0bc Report template
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:57:42 +01:00
Joan Sanchez 5a56fb4b6a Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:50:10 +00:00
Joan Sanchez abe816bbe5 Merge pull request '4550-printServer' (!1131) from 4550-printServer into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1131
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:44:32 +00:00