Commit Graph

7556 Commits

Author SHA1 Message Date
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
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
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 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
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
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
Bernat Exposito Domenech 9d80ec11af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail 2020-06-15 09:54:46 +02:00
Joan Sanchez 1b71c1b3b1 Merge pull request '2290-client_consumption' (#307) from 2290-client_consumption into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 07:21:16 +00:00
Joan Sanchez 279677bda9 Removed report from descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-15 09:07:13 +02:00
Joan Sanchez ed83fd5f73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2290-client_consumption 2020-06-15 09:00:24 +02:00
Bernat Exposito e335775cdb Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:24:23 +00:00
Bernat Exposito 70d5c641ad Merge pull request '2293 - getVolume() call to saleVolume' (#309) from 2293-getVolume into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:16:55 +00:00
Bernat Exposito db1bceb5f4 Merge pull request '2239 - Added services' (#310) from 2239-report_service_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-06-15 06:14:51 +00:00
Joan Sanchez 25b1c6bd8f 2239 - Added services
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 14:28:29 +02:00
Joan Sanchez 36ec930878 Updated test
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 12:01:53 +02:00
Joan Sanchez 3d388ad226 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-12 11:39:33 +02:00
Joan Sanchez dddfe2773a 2293 - getVolume() call to saleVolume
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-12 11:26:32 +02:00
Joan Sanchez 48034b234f 2325 - Search address
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 10:53:33 +02:00
Joan Sanchez cba5fb01a6 Removed onused styles
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 09:28:44 +02:00
Joan Sanchez b3db5681fe 2290 - Added consumption section
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 09:18:19 +02:00
Bernat Exposito Domenech 12468afa3c refactor claim detail 2020-06-11 12:31:52 +02:00