Commit Graph

9724 Commits

Author SHA1 Message Date
Joan Sanchez 322085ffd7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-18 13:15:45 +02:00
Joan Sanchez fcec710d7c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 13:13:47 +02:00
Joan Sanchez 7c45858764 Sms dialog fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 12:59:37 +02:00
Joan Sanchez fa73911452 Added tests
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-18 12:43:33 +02:00
Bernat Exposito Domenech 9af33d1b96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2322-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 11:23:35 +02:00
Bernat Exposito Domenech 84bacfd379 add message before delete a line on a claim
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 10:10:42 +02:00
Joan Sanchez 765d3c7553 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 07:19:57 +02:00
Joan Sanchez 6ab6fc20ca Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 07:19:30 +02:00
Joan Sanchez 43a48994e0 Image path fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 16:33:58 +02:00
Carlos Jimenez Ruiz edea60dd94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz 2abd45f498 setDelivered and open delivery notes and tests 2020-06-17 15:38:37 +02:00
Joan Sanchez 24d3cd74d9 Upgrade Node version
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 15:13:11 +02:00
Joan Sanchez 1d484d4fdf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 15:03:14 +02:00
Joan Sanchez ac6a7e122c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 15:02:57 +02:00
Joan Sanchez 7f3a431ae8 PM2 Min TLS v1.0
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 14:07:14 +02:00
Joan Sanchez b46cc20511 Min TLS v1.0
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 14:03:14 +02:00
Joan Sanchez fd97845979 Revert "Removed sms excluded tests"
This reverts commit 30912bd5e9.
2020-06-17 14:00:04 +02:00
Joan Sanchez 1ab61fbc07 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2020-06-17 13:43:44 +02:00
Joan Sanchez e1ab2881f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 13:43:05 +02:00
Juan Ferrer 8e51104e1b Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:31:54 +02:00
Joan Sanchez 01a09926e3 NodeJs version downgrade to 10 LTS
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 13:30:59 +02:00
Juan Ferrer 032e78664c Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 13:29:24 +02:00
Bernat Exposito Domenech f1b26133cf refactor order index
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:25:12 +02:00
Juan Ferrer 063571cb3c Jenkins fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 13:14:59 +02:00
Juan Ferrer fa882ebde6 Skip tests on master/test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:14:28 +02:00
Juan Ferrer d1bedfdb22 Skip tests on master/test
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-06-17 13:13:13 +02:00
Juan Ferrer 8ece348b30 Language bug fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:09:40 +02:00
Joan Sanchez 63ed592312 902 - Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 11:51:57 +02:00
Bernat Exposito Domenech ebcbd5068f add restrictions in ticket descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 09:49:14 +02:00
Carlos Jimenez Ruiz fb37e156d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note 2020-06-17 09:22:09 +02:00
Joan Sanchez 686203db18 Merge pull request '2275-claim_detail' (#311) from 2275-claim_detail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-17 05:44:17 +00:00
Bernat Exposito Domenech 930e167a8e fix test
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 07:25:05 +02:00
Joan Sanchez 30912bd5e9 Removed sms excluded tests
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 15:11:24 +02:00
Carlos Jimenez Ruiz 7d2e11863f Merge pull request '2300 - WaitForHealthy' (#316) from 2300-docker_waitForHealthy into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-16 11:44:36 +00:00
Joan Sanchez 9970bb2c38 Debug logs
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 13:20:18 +02:00
Carlos Jimenez Ruiz 98300b2fec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note 2020-06-16 13:10:56 +02:00
Carlos Jimenez Ruiz b44942c7d7 open delivery notes on ticket index 2020-06-16 12:36:34 +02:00
Joan Sanchez dd7e6e5716 2300 - WaitForHealthy
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 12:27:17 +02:00
Carlos Jimenez Ruiz d5c366b1da Merge pull request 'edit e2e client web access' (#314) from 2327-e2e_edit_web-access into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-06-16 10:14:44 +00:00
Bernat Exposito Domenech d80d520fba fix claim.beggining
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 12:00:38 +02:00
Bernat Exposito Domenech b6d50f7d8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail 2020-06-16 11:36:06 +02:00
Joan Sanchez 330b268c2c Merge pull request 'hasta precio' (#315) from hasta-precio into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-06-16 08:58:48 +00:00
Javi Gallego 9e62fd78a2 hasta precio
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 10:57:18 +02:00
Javi Gallego 552828a1ba hasta precio
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 10:47:01 +02:00
Bernat Exposito Domenech 201c6173e2 edit e2e client web access
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 10:32:32 +02:00
Bernat Exposito ecf1a1159c Merge pull request '2332 - Fixed on load error' (#313) from 2332-claim_detail_fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-16 07:04:59 +00:00
Joan Sanchez 2f8fa59561 2332 - Fixed on load error
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 09:04:13 +02:00
Joan Sanchez 7fd77bdaef 2332 - Fixed on load error
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 08:50:59 +02:00
Joan Sanchez 5d9ed49451 2285 - Added closure paths
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 08:17:01 +02:00
Bernat Exposito Domenech b33f42d05e add restrictions in claim detail
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 07:47:46 +02:00