8540 Commits

All Branches

Search

Author	SHA1	Message	Date
Jose Antonio Tubau	666cdc7674	Merge pull request 'refactor: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice' (!1174) from 8317-buttonsToRightOnItemFixedPrice into dev ... Reviewed-on: #1174 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-08 06:09:55 +00:00
Jose Antonio Tubau	cdcc3de917	Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice	2025-01-08 06:08:44 +00:00
Jose Antonio Tubau	bb9df49ef9	Merge pull request 'feat: refs #8117 filters and values added as needed' (!1132) from 8117-filtersAndValuesReviewed into dev ... Reviewed-on: #1132 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-08 06:06:51 +00:00
Jon Elias	57ce6d6ea3	Merge branch 'dev' into 8117-filtersAndValuesReviewed	2025-01-08 06:06:02 +00:00
Jose Antonio Tubau	2c8b120ce4	Merge pull request 'test: refs #7100 added test to vnNotes component' (!1121) from 7100-createVnNotesSpec into dev ... Reviewed-on: #1121 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-08 06:05:01 +00:00
Jose Antonio Tubau	79c7d66fe6	Merge branch 'dev' into 7100-createVnNotesSpec	2025-01-08 06:03:37 +00:00
Jose Antonio Tubau	eb6121cbb5	Merge branch 'dev' into 8117-filtersAndValuesReviewed	2025-01-08 06:01:45 +00:00
Jose Antonio Tubau	6ce571a8ab	Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice	2025-01-08 05:59:56 +00:00
PAU ROVIRA ROSALENY	f0889f158d	Merge branch 'dev' into 7088-testFetchedTags	2025-01-08 05:56:57 +00:00
PAU ROVIRA ROSALENY	46cd5382c1	Merge pull request 'feat: #7078 created test for VnJsonValue' (!1168) from 7078-testVnJsonValue into dev ... Reviewed-on: #1168 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-08 05:04:47 +00:00
PAU ROVIRA ROSALENY	663a417a45	Merge branch 'dev' into 7078-testVnJsonValue	2025-01-08 05:03:46 +00:00
Jorge Penadés	c0d909b3e8	Merge pull request 'feat: refs #7957 open in new tab' (!1086) from 7957-monitorChanges into dev ... Reviewed-on: #1086 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 14:38:55 +00:00
Jorge Penadés	08d20d3e7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges	2025-01-07 15:35:45 +01:00
Alex Moreno	5dcf77a226	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-07 15:05:44 +01:00
Alex Moreno	621d98b32b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-07 15:05:33 +01:00
Alex Moreno	ebb4d36fda	fix: refs #8264 parallelism	2025-01-07 15:04:45 +01:00
Jorge Penadés	8f418dcb4b	style: refs #7957 update VnSearchbar padding for improved layout	2025-01-07 14:31:38 +01:00
Jorge Penadés	b289ba3196	Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges	2025-01-07 14:11:44 +01:00
Jon Elias	c9c0a25ff9	Merge pull request '#8220 created items e2e' (!1039) from 8220-ItemsE2E into dev ... Reviewed-on: #1039 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 12:50:35 +00:00
Jon Elias	33ba6d3142	Merge branch 'dev' into 8220-ItemsE2E	2025-01-07 12:48:26 +00:00
PAU ROVIRA ROSALENY	16e4845d83	Merge pull request 'refactor: #8322 changed Worker component to use VnSection/VnCardBeta' (!1152) from 8322-worker into dev ... Reviewed-on: #1152 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 12:26:29 +00:00
PAU ROVIRA ROSALENY	8e1f888134	Merge branch 'dev' into 8322-worker	2025-01-07 12:24:44 +00:00
Jon Elias	ea89cf4062	Merge branch 'dev' into 8220-ItemsE2E	2025-01-07 12:22:32 +00:00
Jorge Penadés	f04aeec21d	fix: refs #7957 update data-cy	2025-01-07 13:21:20 +01:00
PAU ROVIRA ROSALENY	f273540708	Merge pull request 'fix: #8338 fixed VnTable translations' (!1173) from 8338-traduccionesVnTable into dev ... Reviewed-on: #1173 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 12:18:50 +00:00
Jon Elias	548db113eb	refactor: refs #8220 requested changes	2025-01-07 13:16:05 +01:00
Jon Elias	5de2805fa9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E	2025-01-07 13:13:12 +01:00
Alex Moreno	62cdc2b4f7	Merge branch 'dev' into 8322-worker	2025-01-07 12:02:22 +00:00
Alex Moreno	02973cc7d6	fix: refs #8322 unnecessary section	2025-01-07 13:02:04 +01:00
Alex Moreno	5440d94df2	chore: refs #8322 unnecessary prop	2025-01-07 13:00:42 +01:00
Alex Moreno	245530b542	refactor: refs #8322 set department inside worker	2025-01-07 13:00:00 +01:00
Jorge Penadés	73c133c62b	fix: refs #7957 css	2025-01-07 12:26:05 +01:00
Jorge Penadés	d925e3f8b4	fix: refs #7957 css	2025-01-07 12:24:32 +01:00
Jorge Penadés	7b9731a4c8	fix: refs #7957 css	2025-01-07 12:22:21 +01:00
Jorge Penadés	30bdf42f3f	Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges	2025-01-07 12:16:39 +01:00
Jorge Penadés	0703a8c105	Merge pull request 'fix: refs #7323 update getAbsences to handle multiple years for absence data' (!1181) from 7323-hotfix-getNextYearAbsences into master ... Reviewed-on: #1181 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 11:05:20 +00:00
PAU ROVIRA ROSALENY	07222f9fb8	fix: refs #8338 removed chipLocale property/added more translations	2025-01-07 11:43:39 +01:00
Carlos Satorres	8c2f102414	Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword	2025-01-07 11:18:19 +01:00
Carlos Satorres	3953721424	fix: refs #7699 fix component	2025-01-07 11:18:16 +01:00
Jorge Penadés	da0e31b978	fix: refs #7323 update getAbsences to handle multiple years for absence data	2025-01-07 11:17:56 +01:00
PAU ROVIRA ROSALENY	e8bad89008	Merge branch 'dev' into 8338-traduccionesVnTable	2025-01-07 09:42:16 +00:00
Jorge Penadés	c6ccbd98b1	Merge pull request 'fix: refs #7936 disable option caption in EditTableCellValueForm' (!1180) from 7936-hotfix-hideCaption into master ... Reviewed-on: #1180 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 09:39:26 +00:00
Jon Elias	6250894355	Merge pull request 'Fix: EntrySummary view' (!1155) from Fix-EntrySummary into dev ... Reviewed-on: #1155 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 09:33:32 +00:00
Jorge Penadés	e0179d99d6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-hideCaption	2025-01-07 10:33:05 +01:00
Jorge Penadés	59c755329a	fix: refs #7936 update VnSelect to conditionally render option caption	2025-01-07 10:29:37 +01:00
Jon Elias	04f1a805ab	Merge branch 'dev' into Fix-EntrySummary	2025-01-07 09:24:00 +00:00
PAU ROVIRA ROSALENY	e7f2d6ae7f	Merge branch 'dev' into 8322-worker	2025-01-07 09:22:40 +00:00
Jon Elias	c27700db4d	Merge pull request 'Fix: Broken E2E tests' (!1171) from Fix-IntegrationE2ETests into dev ... Reviewed-on: #1171 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 09:12:55 +00:00
Jon Elias	48ba567489	Merge branch 'dev' into Fix-IntegrationE2ETests	2025-01-07 09:09:35 +00:00
Jon Elias	9e59383493	Merge pull request '#7202 added new field in InvoiceOut' (!1160) from 7202-AddCustomAgentFkColumn2 into dev ... Reviewed-on: #1160 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-07 09:05:27 +00:00