3673 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	12370b6437	feat: refs #6346 new wagon type section	2024-07-23 13:22:54 +02:00
Jon Elias	5926381f36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-06-07 13:38:08 +02:00
Javier Segarra	301a62aa9d	Merge pull request 'Mail aliases' (!418) from hyervoni/salix-front-mindshore:feature/MailAliases into dev ... Reviewed-on: #418 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 10:54:36 +00:00
Javier Segarra	21a412f688	Merge branch 'dev' into feature/MailAliases	2024-06-07 10:53:17 +00:00
Alex Moreno	dce95824be	fix(AccountAlias): fix and optimization	2024-06-07 12:51:38 +02:00
Alex Moreno	c392b44195	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-07 12:03:41 +02:00
Jorge Penadés	45998a972b	Merge pull request '#7542 use right panel' (!427) from 7542-warmfix-fixRightPanel into test ... Reviewed-on: #427 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 09:56:20 +00:00
Jorge Penadés	bd7b3c2d06	feat: refs #7542 drop space	2024-06-07 11:54:26 +02:00
Jorge Penadés	5922838fcd	feat: refs #7542 empty	2024-06-07 11:54:06 +02:00
Carlos Satorres	6a9bba287b	Merge pull request 'refs #6905 fix userPanel' (!423) from 6905-fixUserPanelLocal into dev ... Reviewed-on: #423 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 09:50:24 +00:00
Carlos Satorres	3729817c2b	Merge branch 'dev' into 6905-fixUserPanelLocal	2024-06-07 09:47:48 +00:00
Javier Segarra	5551077c92	fix: roles	2024-06-07 11:16:15 +02:00
Javier Segarra	6053d42442	fix: descriptor and i18n	2024-06-07 11:09:46 +02:00
Javier Segarra	567c9ad307	Merge branch 'dev' into feature/MailAliases	2024-06-07 10:46:24 +02:00
Javier Segarra	f01d83cfe5	Merge pull request 'Account ACLs' (!422) from hyervoni/salix-front-mindshore:feature/AccountAcls into dev ... Reviewed-on: #422 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 08:25:05 +00:00
Javier Segarra	3f22d098b0	Merge branch 'dev' into feature/AccountAcls	2024-06-07 08:22:35 +00:00
Javier Segarra	edad698f72	fix: update list when update record	2024-06-07 10:21:41 +02:00
Javier Segarra	6c608e86e6	Merge branch 'feature/AccountAcls' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountAcls	2024-06-07 10:19:55 +02:00
Alex Moreno	7f083bde5c	build: increase version	2024-06-07 10:13:32 +02:00
Javier Segarra	0ea44eb8db	Merge branch 'dev' into feature/AccountAcls	2024-06-07 10:07:15 +02:00
Jorge Penadés	c0c066fd98	fix: refs #7542 use right panel	2024-06-07 09:52:44 +02:00
Javier Segarra	b54cb73c91	Merge pull request 'Zone Calendar' (!411) from hyervoni/salix-front-mindshore:feature/ZoneCalendar into dev ... Reviewed-on: #411 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 07:40:00 +00:00
Javier Segarra	ec5d5e52f4	Merge branch 'dev' into feature/ZoneCalendar	2024-06-07 09:32:51 +02:00
Javier Segarra	53c47301c7	Merge pull request '#6911 save on enter' (!207) from 6911-saveOnEnter into dev ... Reviewed-on: #207 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 07:20:46 +00:00
Alex Moreno	a56df46678	fix(AccountAcls): fix and optimization	2024-06-07 09:07:58 +02:00
Javier Segarra	7880f66c6e	Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-06-07 00:59:20 +02:00
Javier Segarra	28836fc514	test: fix test beacuse use {enter}	2024-06-07 00:59:17 +02:00
Javier Segarra	2a85fe21b0	Merge branch 'dev' into 6911-saveOnEnter	2024-06-07 00:46:42 +02:00
Javier Segarra	1237dd5c10	fix: style workweek	2024-06-07 00:13:49 +02:00
Javier Segarra	17c3a89264	fix: show exclusionEvent in Calendar	2024-06-07 00:01:35 +02:00
Alex Moreno	985ce9a643	deploy: test to dev	2024-06-06 12:24:08 +02:00
Alex Moreno	0f83580766	Merge pull request '#6942 warmfix fix formModel' (!425) from 6942-warmfix-fixFormModel into test ... Reviewed-on: #425 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-06 10:22:27 +00:00
Jorge Penadés	5d041e2d03	fix: refs #6942 fix emit on reset	2024-06-06 12:14:00 +02:00
Jorge Penadés	209d5bd13e	fix: refs #6942 rollback	2024-06-06 12:09:56 +02:00
Jorge Penadés	aba27c204a	Merge pull request '#6891 add toggle' (!417) from 6891-addToggleFilterPanel into dev ... Reviewed-on: #417 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-06 08:48:27 +00:00
Jorge Penadés	b27ae621f3	Merge branch 'dev' into 6891-addToggleFilterPanel	2024-06-06 08:45:12 +00:00
Jorge Penadés	ebbeea0eff	fix: refs #6942 e2e test	2024-06-06 10:28:41 +02:00
Jorge Penadés	97dc299cfe	fix: refs #6942 fix emit on data saved	2024-06-06 09:53:48 +02:00
Javier Segarra	26c7b09b8a	perf: improve handleKeyUp method	2024-06-06 07:50:24 +00:00
Alex Moreno	f66d7b91f7	Merge pull request 'Account Roles' (!413) from hyervoni/salix-front-mindshore:feature/AccountRoles into dev ... Reviewed-on: #413 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-06 07:35:46 +00:00
Alex Moreno	454527b0a7	remove console.log	2024-06-06 09:34:42 +02:00
Alex Moreno	aee3c67ee0	clean code	2024-06-06 09:33:01 +02:00
Alex Moreno	395eb6bed7	Merge branch 'dev' into feature/AccountRoles	2024-06-06 07:32:15 +00:00
Jon Elias	a3d3d7d1e6	Merge pull request '#7502 new Lilium icons' (!420) from 7502-liliumIcons into dev ... Reviewed-on: #420 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-06 06:41:24 +00:00
Jon Elias	057e4780ae	Merge branch '7502-liliumIcons' of https://gitea.verdnatura.es/verdnatura/salix-front into 7502-liliumIcons	2024-06-06 08:38:21 +02:00
Jon Elias	516b905305	feat: refs #7502 new icons v1.73	2024-06-06 08:38:19 +02:00
William Buezas	9ed297207b	Make create form work	2024-06-05 14:52:45 -03:00
Javier Segarra	f453f42b06	feat: New and edit ACL from Popup	2024-06-05 19:37:53 +02:00
Javier Segarra	807460dfad	fix: info icon	2024-06-05 18:14:41 +02:00
Carlos Satorres	b852faf91f	refs #6905 fix userPanel	2024-06-05 08:58:12 +02:00