3786 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	bc30531d42	refs #6897 fix trad	2024-06-18 07:18:44 +02:00
Carlos Satorres	6e4843563c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-12 14:42:06 +02:00
Guillermo Bonet	9388cb3599	Merge branch 'test' into dev	2024-06-12 12:02:12 +02:00
Guillermo Bonet	135e05b139	hotfix: refs #6636 EN i18n	2024-06-12 12:00:43 +02:00
Javier Segarra	ef24a5cd2f	Merge pull request '#7323 FIX default model value depends on route' (!437) from 7323_fix_workerTimeControl into dev ... Reviewed-on: #437 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-12 07:33:27 +00:00
Javier Segarra	11c0154c48	Merge branch 'dev' into 7323_fix_workerTimeControl	2024-06-12 07:31:51 +00:00
Alex Moreno	11d1fdd80e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-12 08:41:03 +02:00
Alex Moreno	6a19687066	Merge pull request 'feat(jenkinsfile): use build_id' (!438) from jenkinsFile_useBuildIdInVersion into master ... Reviewed-on: #438 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-12 06:21:36 +00:00
Alex Moreno	937f75ec63	feat(jenkinsfile): use build_id	2024-06-12 07:40:04 +02:00
Jon Elias	79e84175a6	Merge pull request '#7154 new item descriptor field' (!436) from 7154-ItemDescriptor into dev ... Reviewed-on: #436 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-12 05:05:33 +00:00
Jon Elias	df364dca4a	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-12 05:04:16 +00:00
Javier Segarra	e9051f1ee8	Merge pull request 'Account views: Accounts, Ldap, Samba' (!426) from hyervoni/salix-front-mindshore:feature/AccountFormsView into dev ... Reviewed-on: #426 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-11 19:14:29 +00:00
Javier Segarra	d0759cb654	Merge branch 'dev' into feature/AccountFormsView	2024-06-11 21:12:13 +02:00
Jon Elias	4045a3a631	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 12:56:52 +00:00
Javi Gallego	cb0559fee8	Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #432 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:53:42 +00:00
Jon Elias	2d0b33c626	Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor	2024-06-11 14:29:44 +02:00
Jon Elias	de18b670ea	feat: refs #7154 changed label	2024-06-11 14:29:42 +02:00
Javier Segarra	7ac2aed326	fix: default model value depends on route	2024-06-11 14:09:42 +02:00
Jon Elias	989ea3d82c	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 11:49:25 +00:00
Jon Elias	e5a590a9f9	feat: refs #7154 new item descriptor field	2024-06-11 13:48:15 +02:00
Javier Segarra	57eadbc74e	Merge pull request 'Account connections' (!424) from hyervoni/salix-front-mindshore:feature/AccountConnections into dev ... Reviewed-on: #424 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-11 08:53:26 +00:00
Carlos Satorres	ba0364e799	refs #6897 fix BasicData	2024-06-11 10:30:42 +02:00
Javier Segarra	fac9b6a439	Merge branch 'dev' into feature/AccountConnections	2024-06-11 07:39:41 +00:00
Javier Segarra	fde004af3c	Merge pull request 'Worker descriptor menu' (!433) from hyervoni/salix-front-mindshore:feature/WorkerDescriptorMenu into dev ... Reviewed-on: #433 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 07:39:05 +00:00
Javier Segarra	adbc9dee2c	Merge branch 'dev' into feature/WorkerDescriptorMenu	2024-06-11 07:37:06 +00:00
Jorge Penadés	0624f8dfb7	Merge pull request '#6243 generalize cmr section' (!349) from 6243-generalizeCmrSection into dev ... Reviewed-on: #349 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 07:36:38 +00:00
Jorge Penadés	11bcfb0d2d	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:34:34 +00:00
Jorge Penadés	31081bd471	Merge pull request '#6598 create useAcl composable' (!345) from 6598-getUserAcl into dev ... Reviewed-on: #345 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-11 07:32:46 +00:00
Jorge Penadés	205e7d82a6	Merge branch 'dev' into 6598-getUserAcl	2024-06-11 07:31:15 +00:00
Carlos Satorres	31afa22de8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-11 09:20:23 +02:00
Jorge Penadés	0cfaef2520	Merge pull request '#6273 fix redirect' (!434) from 6273-fixRedirect into dev ... Reviewed-on: #434 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 07:18:14 +00:00
Jorge Penadés	c5889b2170	Merge branch 'dev' into 6273-fixRedirect	2024-06-11 07:16:59 +00:00
Jorge Penadés	01658ee100	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl	2024-06-11 09:10:19 +02:00
Jorge Penadés	f9b688fc37	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:02:37 +00:00
Alex Moreno	9cfdbb3a8b	hotFix: increase version	2024-06-11 08:54:30 +02:00
Alex Moreno	92531216d1	Merge pull request '7565-testToMaster' (!431) from 7565-testToMaster into master ... Reviewed-on: #431 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-11 06:32:59 +00:00
Alex Moreno	0289c167ee	refactor: unnecessary computed	2024-06-11 08:30:18 +02:00
Alex Moreno	5e7ef68439	feat: simplify html	2024-06-11 08:22:26 +02:00
Javi Gallego	b83285000b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-11 08:03:41 +02:00
Javi Gallego	d847b33def	minor change	2024-06-11 08:03:35 +02:00
Javier Segarra	fbecbd0c08	Merge remote-tracking branch 'origin/dev' into feature/WorkerDescriptorMenu	2024-06-10 17:10:05 +02:00
Jorge Penadés	992249c638	fix: refs #6273 redirect	2024-06-10 17:06:28 +02:00
William Buezas	c1df20a09b	Worker descriptor menu	2024-06-10 11:21:23 -03:00
Alex Moreno	1b82ca9243	feat: add changelog	2024-06-10 15:55:22 +02:00
Jorge Penadés	348310bc34	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-06-10 15:37:08 +02:00
Jorge Penadés	9bcfd5c58a	Merge pull request '#6273 create freelance form option' (!347) from 6273-createFreelanceFormOpt into dev ... Reviewed-on: #347 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 13:34:59 +00:00
Jorge Penadés	a5b71ecebc	feat: refs #6273 delete prop	2024-06-10 15:32:38 +02:00
Jorge Penadés	a64cd6fa73	refactor: refs #6273 update locale	2024-06-10 15:21:28 +02:00
Javi Gallego	3f94eabc3d	feat: refs #7548 añado link grafana	2024-06-10 14:47:43 +02:00
Jorge Penadés	9c72597c2c	fix: refs #6273 tests	2024-06-10 14:42:41 +02:00