Commit Graph

22790 Commits

Author SHA1 Message Date
Javi Gallego 4744f57269 Merge pull request 'feat: refs #7548 link a grafana' (!2568) from 7548-ticketSummaryCollection into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2568
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-11 12:54:06 +00:00
Javi Gallego 79c922300b hotfix #6408
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 14:50:47 +02:00
Jorge Penadés ee32bc1008 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 14:40:29 +02:00
Pablo Natek 13d1d0a61c feat: refs #7499 add printedStickers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 14:29:16 +02:00
Robert Ferrús ec7bf13e8c Merge pull request 'fix: refs #7039 fix item-tax' (!2576) from 7039-fixCountry into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2576
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-06-11 12:20:59 +00:00
Robert Ferrús 8039530ab4 fix: refs #7039 fix item-tax
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 14:15:10 +02:00
Guillermo Bonet aa0e06cfec refactor: refs #7505 Changed name
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 14:00:59 +02:00
Guillermo Bonet 3bd596e5fd refactor: refs #7505 Added description
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 13:53:41 +02:00
Guillermo Bonet 4f10a93584 refactor: refs #7505 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 13:36:46 +02:00
Jon Elias 944355d54f refactor: refs #6436 end first wave of changes in modules
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 13:17:19 +02:00
Alex Moreno 3b44bdd2bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:56:56 +02:00
Guillermo Bonet a9aad7406a refactor: refs #7505 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:51:36 +02:00
Carlos Andrés d75e008a23 feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:49:33 +02:00
Jorge Penadés a6c8b2bebe Merge pull request 'hotfix buyer editZone acl' (!2572) from hotfix-buyerEditZoneAcl into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2572
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-11 10:47:35 +00:00
Carlos Andrés ed7218c133 feat: previas con sitema de reservas refs #6861
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:44:25 +02:00
Guillermo Bonet 9f9063567a refactor: refs #7505 item_getVisible refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:40:07 +02:00
Jon Elias 665d03f048 refactor: refs #6436 user-config and some sections tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:35:44 +02:00
Carlos Satorres 5d7a570c3f refs #6897 fix redirection
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:28:49 +02:00
Jorge Penadés 1cefe817f5 feat: add editZone ACL for buyer
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 12:06:44 +02:00
Jon Elias bd45352215 refactor: refs #6436 fourth wave
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:02:15 +02:00
Guillermo Bonet deff65918d Merge pull request 'feat: refs #7568 Added freelancer exception' (!2571) from 7568-ticket_doCmr into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2571
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-11 09:22:29 +00:00
Jorge Penadés 96366c475a fix: refs 6449 update changelog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 10:48:28 +02:00
Guillermo Bonet 76f76b8304 feat: refs #7568 Added freelancer exception
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 10:48:24 +02:00
Jon Elias 093eaeb475 refactor: refs #6436 third wave
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 10:45:46 +02:00
Jorge Penadés 902a9ee51b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 10:43:33 +02:00
Jon Elias b3fa869757 refactor: refs #6436 second wave
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 10:00:30 +02:00
Alex Moreno 9c2ccc5df4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 09:59:09 +02:00
Jon Elias 7df7382346 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:41:26 +02:00
Jorge Penadés 8117b748b3 Merge pull request '#6243 generalize cmr section' (!2406) from 6243-generalizeCmrSection into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2406
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-11 07:41:19 +00:00
Jon Elias f0ad012835 refactor: refs #6436 first wave 2024-06-11 09:39:06 +02:00
Alex Moreno c9885920e7 Merge pull request 'build: dump' (!2569) from 7565-dump into master
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
Reviewed-on: #2569
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-06-11 07:37:04 +00:00
Jorge Penadés 6b04b371f2 Merge branch 'dev' into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 07:36:58 +00:00
Jorge Penadés 6aca0765c0 Merge pull request '#6598 acls back' (!2400) from 6598-getUserAcls into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2400
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-06-11 07:31:03 +00:00
Carlos Satorres 21d2d66013 Merge branch '6897-entryMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:19:08 +02:00
Carlos Satorres b38c5cdecc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration 2024-06-11 09:19:05 +02:00
Alex Moreno a446c278b4 Merge branch 'master' into 7565-dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 07:17:11 +00:00
Jorge Penadés d30cd68417 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:11:56 +02:00
Guillermo Bonet 873f36fef6 refactor: refs #7503 Added relations and ACLs
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 08:50:32 +02:00
Alex Moreno 2dec51804c build: dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 08:38:26 +02:00
Alex Moreno 7adf4a373d Merge pull request '7565-testToMaster' (!2567) from 7565-testToMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2567
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-06-11 06:31:16 +00:00
Alex Moreno 282cf96336 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7565-testToMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 08:04:09 +02:00
Guillermo Bonet bd13ecd464 refactor: refs #7486 engine memory and primary key sales_merge
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 07:59:53 +02:00
Sergio De la torre 62f4561279 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7168-itemShelvingLog_get
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 07:34:42 +02:00
Alex Moreno 2061d08bac feat: add changelog
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-10 15:54:53 +02:00
Jorge Penadés 562e8689e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 15:36:34 +02:00
Jorge Penadés 59474a9dfb Merge pull request '#6273 register freelance' (!2403) from 6273-registerFreelance into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2403
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-10 13:34:50 +00:00
Jorge Penadés 8e3cc574ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 15:21:59 +02:00
Javi Gallego e081c4504d feat: refs #7548 link a grafana
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 14:51:48 +02:00
Alex Moreno c241189508 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-10 14:22:12 +02:00
Guillermo Bonet 75a529830c Merge pull request 'refactor: refs #7486 Optimized procs' (!2564) from 7486-productionControl into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2564
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-10 11:33:10 +00:00