23369 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	de0f0623e1	Merge branch 'master' into 6408-hotFix_updateQuantity	2024-06-12 08:07:25 +00:00
Alex Moreno	d9b0a1a75c	fix(updateQuantity): fix rocket translation	2024-06-12 09:59:58 +02:00
Alex Moreno	b31a38e03b	Merge pull request 'fix(sale): rocket is only sent if it has sales' (!2580) from 6408-hotFix_sales_length into master ... Reviewed-on: #2580 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-12 07:33:53 +00:00
Alex Moreno	789e0e65e3	fix(sale): rocket is only sent if it has sales	2024-06-12 09:12:48 +02:00
Alex Moreno	8dcd04384b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 08:39:59 +02:00
Alex Moreno	4833ba4def	Merge pull request 'feat(jenkinsfile): use build_id' (!2579) from jenkinsFile_useBuildIdInVersion into master ... Reviewed-on: #2579 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-12 06:37:37 +00:00
Jon Elias	2b45c2c61a	feat: refs #6436 new test changes, rollback order/filter and /ticket/clone	2024-06-12 08:25:50 +02:00
Alex Moreno	08d6384fd4	Merge branch 'master' into jenkinsFile_useBuildIdInVersion	2024-06-12 06:24:04 +00:00
Alex Moreno	60d4372996	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-12 07:51:01 +02:00
Alex Moreno	1eee1d0e9b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 07:47:56 +02:00
Alex Moreno	a0146597d5	Merge pull request 'hotfix #6408' (!2578) from hotFix-6408 into master ... Reviewed-on: #2578 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-12 05:46:33 +00:00
Alex Moreno	c4c6df5a78	feat(jenkinsfile): use build_id	2024-06-12 07:41:00 +02:00
Guillermo Bonet	17fa1e10f6	feat: refs #6701 Added claimRatio_afterInsert	2024-06-12 07:33:10 +02:00
Carlos Andrés	b9d1c3228b	feat: previas con sitema de reservas refs #6861	2024-06-11 18:43:26 +02:00
Pablo Natek	11a7d890a0	Merge pull request 'feat: refs #7499 add printedStickers' (!2577) from 7499-add-printedStickers into dev ... Reviewed-on: #2577 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-11 14:32:14 +00:00
Jorge Penadés	d7d6de73c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-06-11 15:41:06 +02:00
Javi Gallego	4744f57269	Merge pull request 'feat: refs #7548 link a grafana' (!2568) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #2568 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:54:06 +00:00
Javi Gallego	79c922300b	hotfix #6408	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	2024-06-11 14:40:29 +02:00
Pablo Natek	13d1d0a61c	feat: refs #7499 add printedStickers	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 ... 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	2024-06-11 14:15:10 +02:00
Guillermo Bonet	aa0e06cfec	refactor: refs #7505 Changed name	2024-06-11 14:00:59 +02:00
Guillermo Bonet	3bd596e5fd	refactor: refs #7505 Added description	2024-06-11 13:53:41 +02:00
Guillermo Bonet	4f10a93584	refactor: refs #7505 Minor change	2024-06-11 13:36:46 +02:00
Jon Elias	944355d54f	refactor: refs #6436 end first wave of changes in modules	2024-06-11 13:17:19 +02:00
Alex Moreno	3b44bdd2bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-11 12:56:56 +02:00
Guillermo Bonet	a9aad7406a	refactor: refs #7505 Minor change	2024-06-11 12:51:36 +02:00
Carlos Andrés	d75e008a23	feat: previas con sitema de reservas refs #6861	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 ... 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	2024-06-11 12:44:25 +02:00
Guillermo Bonet	9f9063567a	refactor: refs #7505 item_getVisible refactor	2024-06-11 12:40:07 +02:00
Jon Elias	665d03f048	refactor: refs #6436 user-config and some sections tests	2024-06-11 12:35:44 +02:00
Carlos Satorres	5d7a570c3f	refs #6897 fix redirection	2024-06-11 12:28:49 +02:00
Jorge Penadés	1cefe817f5	feat: add editZone ACL for buyer	2024-06-11 12:06:44 +02:00
Jon Elias	bd45352215	refactor: refs #6436 fourth wave	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 ... 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	2024-06-11 10:48:28 +02:00
Guillermo Bonet	76f76b8304	feat: refs #7568 Added freelancer exception	2024-06-11 10:48:24 +02:00
Jon Elias	093eaeb475	refactor: refs #6436 third wave	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	2024-06-11 10:43:33 +02:00
Jon Elias	b3fa869757	refactor: refs #6436 second wave	2024-06-11 10:00:30 +02:00
Alex Moreno	9c2ccc5df4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	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	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 ... 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 ... 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	2024-06-11 07:36:58 +00:00
Jorge Penadés	6aca0765c0	Merge pull request '#6598 acls back' (!2400) from 6598-getUserAcls into dev ... 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	2024-06-11 09:19:08 +02:00