Merge dev-test #123

Merged
jsegarra merged 38 commits from dev into test 2023-12-07 08:44:39 +00:00

38 Commits

Author SHA1 Message Date
Javier Segarra e45f4b38bb Merge pull request 'ci: dev-test' (!124) from #6527_dev-test into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #124
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-07 08:23:39 +00:00
Javier Segarra 84226d48ed ci: dev-test
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-07 08:46:38 +01:00
Javi Gallego e82c675d7d Merge branch 'test' into dev
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-07 07:54:39 +01:00
Javi Gallego dfabdeb706 Merge branch 'test' into dev 2023-12-07 07:54:36 +01:00
Jorge Penadés ca9d3611af Merge pull request 'refs #6545 counters created' (!116) from 6545-trolleyCounter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #116
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-05 07:47:51 +00:00
Jorge Penadés e22c400326 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6545-trolleyCounter
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-05 08:32:15 +01:00
Carlos Satorres f8659c2153 Merge pull request 'refs #6334 fix amount, colors' (!117) from 6334-updateLinesAmount into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #117
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-05 06:08:05 +00:00
Jorge Penadés a730f2c073 refs #6545 refactor
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-04 15:07:40 +01:00
Carlos Satorres 03e42f676b refs #6334 remove class
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-04 12:02:27 +01:00
Carlos Satorres 4eee95b945 refs #6334 fix amount, colors
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-04 11:40:17 +01:00
Jorge Penadés a3d6275b2f refs #6545 counters created
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-04 10:38:35 +01:00
Alex Moreno cad5d830a0 Merge pull request 'refs #6062 feat(arrayData): support exprBuilder' (!112) from 6062-exprBuilder into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #112
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-11-27 12:23:33 +00:00
Alex Moreno 54379b3e65 typo
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-24 13:32:20 +01:00
Alex Moreno 023cfc6ac7 refs #6062 feat(arrayData): support exprBuilder
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-24 13:31:08 +01:00
Alex Moreno dacfe1a96d refs #5654 fix(descriptors): add data-key
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-24 10:36:31 +01:00
Carlos Satorres 247f935334 Merge pull request '6157-actionClaim' (!106) from 6157-actionClaim into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #106
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-24 07:46:29 +00:00
Carlos Satorres 98fa68bb80 refs 6157 markerlabel
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-24 08:41:21 +01:00
Carlos Satorres c3d9085a57 refs #6157 minorFix
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-24 08:10:44 +01:00
Carlos Satorres d03092f41d refs #6157 arrayData
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-23 15:50:42 +01:00
Carlos Satorres 1320db7bf0 refs #6157 e2e + front
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-20 18:13:26 +01:00
Carlos Satorres ce4fe44b03 refs #6157 refactor
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-17 14:06:43 +01:00
Carlos Satorres 9b11ca05a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim 2023-11-16 13:16:57 +01:00
Carlos Satorres ae655dabe2 refs #6157 refactor stateColor, updateDestinations, change responsability
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-09 13:52:45 +01:00
Carlos Satorres 20bbee8397 Merge branch '6157-actionClaim' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-07 12:50:57 +01:00
Carlos Satorres b98f982495 refs #6157 remove salixUrl 2023-11-07 12:50:54 +01:00
Carlos Satorres b89f5aadf1 Merge branch 'dev' into 6157-actionClaim
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-07 11:43:57 +00:00
Carlos Satorres 35eae2f9a5 remove consolelog
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-07 12:43:10 +01:00
Carlos Satorres 6db52e00ea refs #6157 test ui
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-07 12:42:39 +01:00
Carlos Satorres 08060d276a refs #6157 fix arraydata, and internal error
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-03 13:41:10 +01:00
Carlos Satorres ef177c01e5 refs #6157 reguralize import migrate
gitea/salix-front/pipeline/head This commit looks good Details
2023-11-02 14:08:10 +01:00
Carlos Satorres abb1b3f7c1 refs #6157 card
gitea/salix-front/pipeline/head This commit looks good Details
2023-10-30 11:28:48 +01:00
Carlos Satorres 8a6a3083a3 refs #6157 cardDescriptor 2023-10-25 14:06:15 +02:00
Carlos Satorres dfa29875d5 refs #6157 store
gitea/salix-front/pipeline/head This commit looks good Details
2023-10-22 07:19:33 +02:00
Carlos Satorres cea811903e refs #6157 icon mobile
gitea/salix-front/pipeline/head This commit looks good Details
2023-10-19 17:07:06 +02:00
Carlos Satorres 841ed5d81a refs #6157 change hide, descriptor, development
gitea/salix-front/pipeline/head This commit looks good Details
2023-10-19 14:29:38 +02:00
Carlos Satorres 6dc1767b56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim 2023-10-19 14:00:03 +02:00
Carlos Satorres 5418ac069b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim 2023-10-18 15:34:57 +02:00
Carlos Satorres f230fcbca2 refs #6157 claimAction
gitea/salix-front/pipeline/head This commit looks good Details
2023-10-17 17:32:47 +02:00