Commit Graph

25592 Commits

Author SHA1 Message Date
Javier Segarra 03d4427bcd Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 12:16:15 +00:00
Jon Elias 662ede981b Merge branch 'dev' into 7356-FixTicketWeekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 11:59:42 +00:00
Jorge Penadés 6e511f00c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 13:58:46 +02:00
Jon Elias 97b07ea561 fix: refs #7356 ticket weekly filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 13:56:30 +02:00
Alex Moreno 5a04083d31 Merge pull request 'feat(AccessToken&ACL): refs #7547 upgrade security' (!2630) from 7547-accessToken-security into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2630
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-09-09 11:02:06 +00:00
Carlos Andrés 804d10894b Merge pull request 'fix: ticket 218504 ticket_close' (!2938) from Hotfix-Ticket-218504-ticket_Close into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2938
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-09 10:53:19 +00:00
Javier Segarra 2fef104954 Merge branch 'dev' into 6156-advanceTicketsNewField 2024-09-09 10:48:20 +00:00
Guillermo Bonet 689315bab8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 12:42:21 +02:00
Guillermo Bonet d9a4b3e6fb fix: refs #7346 Global invoice 2024-09-09 12:42:19 +02:00
Alex Moreno 0949112b13 Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 12:42:13 +02:00
Carlos Andrés 88a8b4975b fix: ticket 218504 ticket_close
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-09 12:37:49 +02:00
Juan Ferrer d2ead9d936 Merge pull request 'fix: refs #7931 Merge available fix into master' (!2936) from test into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2936
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-09-09 10:20:42 +00:00
Javier Segarra 31b04cba75 feat(salix): refs #6156 #6156 Move to myt version 2024-09-09 12:08:12 +02:00
Carlos Satorres a25dac140e Merge pull request 'refs #6898 fix supplier remove' (!2605) from 6998-supplierMigration into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2605
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-09 09:56:41 +00:00
Carlos Satorres 01690ed081 Merge branch 'dev' into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 09:39:15 +00:00
Guillermo Bonet daf3dfd2ee Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:35:28 +02:00
Guillermo Bonet 3c6b7cd224 Merge branch 'master' into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:35:08 +02:00
Guillermo Bonet 723ec2b453 fix: refs #7844 Filter monitor
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:34:42 +02:00
Carlos Satorres 44a183785e Merge branch 'dev' into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 09:32:43 +00:00
Alex Moreno ae15d51341 Merge branch 'dev' into 7792-twoFactorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 08:39:36 +00:00
Javier Segarra 378ee1119f Merge branch 'dev' of https: refs #6156//gitea.verdnatura.es/verdnatura/salix into 6156-advanceTicketsNewField 2024-09-09 10:18:10 +02:00
Javier Segarra 7710b87f4a test(salix): refs #7671 #7671 improve and revert where changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 10:07:05 +02:00
Jon Elias c93275b62d Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 08:06:04 +00:00
Jorge Penadés 18ec76d156 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 10:03:22 +02:00
Alex Moreno 71eb44d083 refactor(vnUser): refs #7792 use twoFactorFk and add foreignKey
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-09 09:58:20 +02:00
Javier Segarra 57dbdc6f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 09:58:07 +02:00
Javier Segarra 6012604946 perf(salix): refs #7671 #7671 imrpove and revert where changes 2024-09-09 09:57:38 +02:00
Alex Moreno d7613767fb Merge pull request 'feat: refs #7938 remove unnecessary insert in clientLog' (!2934) from 7938-unnecessary_insert_clientLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2934
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-09 07:46:12 +00:00
Guillermo Bonet 261bebbc3b feat: refs #6727 Deleted duplicated indexes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 09:41:40 +02:00
Guillermo Bonet 56eb3e093d feat: refs #6727 Added indexes in creationDate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 09:39:10 +02:00
Guillermo Bonet 7053f2786a Merge branch 'dev' into 6727-logClean 2024-09-09 09:38:40 +02:00
Guillermo Bonet 0c4b9dcdae Merge pull request 'feat: refs #4515 New throw buy_checkItem' (!2935) from 4515-throwBuyCheck into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2935
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-09 07:07:53 +00:00
Jorge Penadés af1cab44eb Merge pull request 'fix: refs #7323 fetch from right source' (!2933) from 7323-replaceWorkerDataSource into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2933
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-09 07:05:01 +00:00
Guillermo Bonet c4527cc5c5 feat: refs #4515 New throw buy_checkItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 08:28:27 +02:00
Pablo Natek 25ff498a0b Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master Build queued... Details
2024-09-09 05:54:07 +00:00
Alex Moreno 632d3190b1 feat: refs #7938 remove unnecessary insert in clientLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 07:49:22 +02:00
Jon Elias 3e9f472447 Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 05:33:34 +00:00
Jon Elias b3aa263cea Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 07:32:11 +02:00
Javier Segarra 5c4a30f2f9 perf: refs #7671 improve showBadDates
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-08 12:50:32 +02:00
Javier Segarra dbd8f94555 perf: refs #7671 improve showBadDates 2024-09-08 12:49:55 +02:00
Javier Segarra 59cce5d349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices 2024-09-08 12:31:39 +02:00
Jorge Penadés ba2c5cb209 chore: refs #7323 filter data
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 17:49:45 +02:00
Jorge Penadés 0a4bd0f2d5 chore: refs #7323 fix test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 16:09:29 +02:00
Jorge Penadés 6065c056e2 chore: refs #7323 fix test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-06 16:04:40 +02:00
Jorge Penadés eb11e18df5 fix: refs #7323 fetch from right source
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-06 16:01:26 +02:00
Juan Ferrer b0f1cc69af Merge pull request 'fix(hedera): refs #7931 PROC order_addItem NULL available fix, translations added' (!2932) from 7931-availableFix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2932
2024-09-06 13:02:22 +00:00
Juan Ferrer 37fabc38bd fix(hedera): refs #7931 PROC order_addItem NULL available fix, translations added
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-06 14:56:14 +02:00
Jorge Penadés c43c61991d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 14:22:57 +02:00
Jorge Penadés 901cdc7117 feat: refs #4074 modify acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 14:18:15 +02:00
Jorge Penadés 05b75c1f0d Merge pull request 'chore: refs #7323 worker changes wip' (!2930) from 7323-dynamicRole into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2930
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-06 12:03:20 +00:00