8886 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	cfcbb8bce5	Merge pull request 'refactor: #8322 changed Travel component to use VnSection/VnCardBeta' (!1220) from 8322-travel into dev ... Reviewed-on: #1220 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-24 09:14:18 +00:00
Alex Moreno	1dc19a6eaa	fix: refs #8322 filter and params	2025-01-24 10:11:30 +01:00
Alex Moreno	6ff1ae96d5	Merge branch 'dev' into 8322-travel	2025-01-24 09:04:53 +00:00
Alex Moreno	cbf7ef7ccf	Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1150) from 8316-parkingCardWithVnCardBeta into dev ... Reviewed-on: #1150 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-24 09:04:05 +00:00
Alex Moreno	c6f613c5e5	fix: refs #8316 redirections	2025-01-24 10:02:23 +01:00
Alex Moreno	221dda174a	Merge branch 'dev' into 8316-parkingCardWithVnCardBeta	2025-01-24 08:08:25 +00:00
Alex Moreno	10448b9d77	Merge pull request 'refactor: refs #8316 used VnSection and VnBetaCard' (!1147) from 8316-itemCardWithVnCardBeta into dev ... Reviewed-on: #1147 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-24 08:06:47 +00:00
Alex Moreno	6e588278d8	Merge branch 'dev' into 8316-itemCardWithVnCardBeta	2025-01-24 08:05:49 +00:00
Alex Moreno	1455d8ce02	fix: refs #8316 filter	2025-01-24 09:04:01 +01:00
Alex Moreno	e38e9b1dd7	fix: refs #8316 filter	2025-01-24 09:01:54 +01:00
Alex Moreno	8e3fad60c0	fix: refs #8316 icon	2025-01-24 08:59:47 +01:00
Jon Elias	26bc5401f1	Merge pull request '#8339 - fix_preview' (!1277) from 8339_fix_preview into dev ... Reviewed-on: #1277 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-24 07:55:19 +00:00
Javier Segarra	a3acb3b190	Merge branch 'dev' into 8339_fix_preview	2025-01-24 07:51:20 +00:00
Alex Moreno	55d86d3153	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-24 08:40:50 +01:00
Alex Moreno	e6279ff261	build: merge master in test	2025-01-24 08:38:24 +01:00
Javier Segarra	bddfd91de1	perf: refs #8339 minor changes	2025-01-24 08:09:48 +01:00
Javier Segarra	d9cc35280b	feat: refs #8339 define global.spreview	2025-01-24 08:09:31 +01:00
Javier Segarra	58fd5a8326	perf: refs #8339 removew preview tag	2025-01-24 08:09:14 +01:00
Alex Moreno	23e1a58f28	fix: refs #8316 advanced-menu	2025-01-24 07:32:02 +01:00
Alex Moreno	e53990d880	Merge branch 'dev' into 8316-itemCardWithVnCardBeta	2025-01-24 06:19:26 +00:00
Jose Antonio Tubau	5bb165757a	Merge pull request 'test: refs #7073 add unit tests for VnDms component' (!1198) from 7073-createTestToVnDms into dev ... Reviewed-on: #1198 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 13:55:32 +00:00
Jose Antonio Tubau	9b3ebff1c7	Merge branch 'dev' into 7073-createTestToVnDms	2025-01-23 13:54:31 +00:00
Robert Ferrús	bf4faa88a1	Merge pull request 'feat: refs #8398 moveTicketsFuture' (!1223) from 8398-mergeSendCheckingPresence into dev ... Reviewed-on: #1223 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 09:50:56 +00:00
Robert Ferrús	961c9a6973	Merge branch 'dev' into 8398-mergeSendCheckingPresence	2025-01-23 08:22:02 +00:00
Jon Elias	8c46ee45c2	Merge pull request '#7184: Added myTeam filter at WorkerFilter' (!1271) from 7184-MyTeamFilter into dev ... Reviewed-on: #1271 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 08:03:02 +00:00
Jon Elias	807567cede	Merge branch 'dev' into 7184-MyTeamFilter	2025-01-23 07:59:45 +00:00
Alex Moreno	f9dd927292	Merge pull request '#8197 - advancedMenu' (!1248) from 8197-advancedMenu into dev ... Reviewed-on: #1248 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-23 07:27:36 +00:00
Alex Moreno	a0895488b4	Merge branch 'dev' into 8197-advancedMenu	2025-01-23 07:20:05 +00:00
Alex Moreno	f86dc7b60f	fix: defineProps not import	2025-01-23 08:19:42 +01:00
Alex Moreno	58edd511dc	fix: refs #8197 improve code robustness by adding optional chaining and fixing syntax errors	2025-01-23 08:18:24 +01:00
Jose Antonio Tubau	2068fa4795	Merge branch 'dev' into 7073-createTestToVnDms	2025-01-23 07:08:58 +00:00
Alex Moreno	fc886c2a8b	Merge branch 'dev' of https: refs #8197//gitea.verdnatura.es/verdnatura/salix-front into 8197-advancedMenu	2025-01-23 07:33:45 +01:00
Jon Elias	81718c0c4d	feat: refs #7184 added myTeam filter at WorkerFilter	2025-01-22 16:35:13 +01:00
PAU ROVIRA ROSALENY	a6adec0407	Merge pull request 'feat: #7103 created test for VnSearchbar' (!1256) from 7103-testVnSearchbar into dev ... Reviewed-on: #1256 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-22 11:15:20 +00:00
PAU ROVIRA ROSALENY	d361ecd514	Merge branch 'dev' into 7103-testVnSearchbar	2025-01-22 11:13:37 +00:00
Alex Moreno	273d086154	Merge pull request 'feat: refs #7196 update vite and q-calendar' (!1264) from 7196-updateVite into dev ... Reviewed-on: #1264 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-22 11:05:56 +00:00
Alex Moreno	a8870ec46a	Merge branch 'dev' into 7196-updateVite	2025-01-22 11:02:17 +00:00
PAU ROVIRA ROSALENY	ffe17751d9	Merge branch 'dev' into 7103-testVnSearchbar	2025-01-22 10:43:41 +00:00
Javier Segarra	88ce527bf1	Merge pull request '#7308 - Warning inject' (!1065) from 7308_warning into dev ... Reviewed-on: #1065 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-22 10:41:32 +00:00
PAU ROVIRA ROSALENY	f94c457263	Merge branch 'dev' into 7103-testVnSearchbar	2025-01-22 10:40:49 +00:00
PAU ROVIRA ROSALENY	ea4a46d9c7	fix: refs #7103 used consts for repeated variables	2025-01-22 11:40:25 +01:00
Alex Moreno	0b17da1b76	Merge branch '7196-updateVite' of https://gitea.verdnatura.es/verdnatura/salix-front into 7196-updateVite	2025-01-22 11:11:42 +01:00
Alex Moreno	675820eff6	fix: refs #7196 not neccessary	2025-01-22 11:11:41 +01:00
Jon Elias	3b0d0afddb	Merge pull request 'Warmfix[WorkerDescriptor]: link to DepartmentDescriptor' (!1269) from Warmfix-WorkerDescriptorLink into test ... Reviewed-on: #1269 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-22 10:03:34 +00:00
Javier Segarra	48a1f89399	Merge branch 'dev' into 7196-updateVite	2025-01-22 10:01:38 +00:00
Javier Segarra	c19f49dcdd	Merge branch 'dev' into 7308_warning	2025-01-22 10:01:05 +00:00
Alex Moreno	650a5409b1	Merge branch '7196-updateVite' of https://gitea.verdnatura.es/verdnatura/salix-front into 7196-updateVite	2025-01-22 10:58:01 +01:00
Alex Moreno	155b8b3743	fix: refs #7196 sass	2025-01-22 10:57:59 +01:00
Alex Moreno	1bbee11ec0	Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1142) from 8316-customerCardWithVnCardBeta into dev ... Reviewed-on: #1142 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-22 09:11:30 +00:00
Javier Segarra	8dc277ec2a	Merge branch 'dev' into 7196-updateVite	2025-01-22 08:58:28 +00:00