Commit Graph

16753 Commits

Author SHA1 Message Date
Carlos Satorres 30924bb8f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5575-tercerDecimalLatest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 09:44:38 +02:00
Carlos Satorres 89a3ef5f8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 09:30:20 +02:00
Carlos Satorres 16fdfa00fd refs #5066 e2e solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 09:09:48 +02:00
Alex Moreno 239685b43f (231401) master to test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 08:52:48 +02:00
Juan Ferrer 6f35eb0ce3 Merge pull request '231401_test_to_production' (!1464) from 231401_test_to_production into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1464
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-04-20 06:45:45 +00:00
Alex Moreno 7df4a2b15d fix(231401): fix tests and fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 08:25:15 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Carlos Satorres b45b0ff826 refs #5066 copy project from the other
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 08:23:46 +02:00
Alexandre Riera aecde484f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:52:05 +02:00
Alexandre Riera 84c2512847 refs #5293 open lilium in the same page
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:51:25 +02:00
Alexandre Riera 4f25f153a9 Merge pull request 'fix e2e smartTable' (!1462) from fix-e2e-smartTable into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1462
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-04-20 05:15:53 +00:00
Alex Moreno 39333a9119 refs #5488 replace hasRole for checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 15:23:32 +02:00
Vicent Llopis f6bf92b74b refs #5128 intentando poner icono grafana
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 15:21:59 +02:00
Vicent Llopis 6fbb734a34 quitado salto de linea
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 14:43:23 +02:00
Vicent Llopis 187ba032d2 refs #5128 rol por ACL 2023-04-19 14:43:15 +02:00
Alex Moreno c1d4281b1b refs #5488 replace hasWriteRole, hasReadRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:59:26 +02:00
Alexandre Riera 0b5d16a78c fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:26:56 +02:00
Vicent Llopis 34b360040b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 12:18:45 +02:00
Guillermo Bonet 6f96820168 refs #5237 Ahora lee un conjunto de arrays
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 10:16:37 +02:00
Vicent Llopis 5ace66ebca refs #5318 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:54:54 +02:00
Vicent Llopis be8a11cafc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 09:52:28 +02:00
Carlos Satorres a559c1f648 refs #5575 mod3Decimal
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:02:04 +02:00
Juan Ferrer 61d41fb687 refs #5507
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 08:54:58 +02:00
Alex Moreno bde81e685f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 07:55:46 +02:00
Juan Ferrer a85135b1c8 refs #5553 New parameter to skip lock
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 21:27:09 +02:00
Juan Ferrer 5dd7c7e3bd refs #5553 Improve error handling
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 20:53:49 +02:00
Juan Ferrer dc853213b8 refs #5553 Allow to skip default transaction timeout
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 20:33:39 +02:00
Juan Ferrer 8763dc32c4 refs #5553 Code syntax refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 17:25:37 +02:00
Juan Ferrer 26faab6a84 refs #5553 Exclusive lock fix, don't stop when unlink fails
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 17:23:38 +02:00
Carlos Satorres 3ead22968a Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 13:28:28 +00:00
Vicent Llopis 3c334a9f01 refs #5128 fix e2e: manejado que pueda haver más de 1 menú desplegable en el card
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 15:16:59 +02:00
Alex Moreno db19f153fb refs #5488 removes 'role =='
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 15:03:23 +02:00
Joan Sanchez 6f2aa0f618 Worker note ACL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 14:51:48 +02:00
Joan Sanchez 8f100c6021 Merge pull request 'hotfix paginate negative bases' (!1444) from hotfix-paginate-negativeBases into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1444
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-18 12:46:42 +00:00
Joan Sanchez c3443ecc7c Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 14:37:20 +02:00
Carlos Satorres 274aff14b5 Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 12:15:30 +00:00
Alexandre Riera bf335a0447 Merge branch 'test' into hotfix-paginate-negativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 11:55:50 +00:00
Joan Sanchez 90b38d02a0 Default username property
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 13:16:25 +02:00
Joan Sanchez c2af40edb5 changes 2023-04-18 13:15:04 +02:00
Joan Sanchez d5ea45e36f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 13:14:57 +02:00
Joan Sanchez 1d7c1f8d41 Merge pull request 'hotfix expedition-pallet template' (!1458) from hotfix_arcRfid2 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1458
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-04-18 11:00:00 +00:00
Vicent Llopis 6b72d88256 test
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-04-18 12:55:18 +02:00
Joan Sanchez e0a8daf2f8 Merge pull request '4480-vnUser - Replaced model Account in favor of VnUser' (!1267) from 4480-vnUser into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1267
2023-04-18 09:52:24 +00:00
Joan Sanchez cdf092a989 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 11:52:17 +02:00
Joan Sanchez 32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 11:41:55 +02:00
Joan Sanchez a0d8ed1433 E2e fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 11:33:36 +02:00
Alexandre Riera 11b905138f Merge pull request 'fixes #5418 Buscador lateral en item/fixed-price' (!1412) from 5418-buscador-lateral-fixed-price into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1412
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-04-18 08:49:53 +00:00
Carlos Satorres 3c639b9a2b refs # cambios entrantes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 10:48:41 +02:00
Alexandre Riera 2df362327f Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 08:33:15 +00:00
Alexandre Riera e8e373d924 Merge pull request 'fixes #5518 Crear secciones de histórico para usuarios y roles' (!1446) from 5518-log-user-role into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1446
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-04-18 08:31:17 +00:00