3139 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	99d16d215f	refs #6332 colors	2024-05-21 11:56:30 +02:00
Carlos Satorres	adde8d1ab8	refs #6332 fix colors	2024-05-15 16:00:56 +02:00
Javier Segarra	9b64a82a71	Merge pull request 'Zone create' (!371) from hyervoni/salix-front-mindshore:feature/ZoneCreate into dev ... Reviewed-on: #371 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-15 07:49:35 +00:00
Alex Moreno	2b27e39d72	fix: zone icon and isVolumetric default false	2024-05-15 09:37:33 +02:00
Javier Segarra	fc6bd82ea0	Merge branch 'dev' into feature/ZoneCreate	2024-05-14 11:52:29 +02:00
Javier Segarra	19bdd4fc36	Merge pull request 'feat: refs #7271 basicData and Log' (!369) from 7271-EndZoneMigration into dev ... Reviewed-on: #369 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-14 09:49:20 +00:00
Javier Segarra	f4dd9b84fd	fix: VnLocation > fiscal-data	2024-05-14 11:42:34 +02:00
Javier Segarra	cb40505f82	fix: VnLocation > workercreate	2024-05-14 11:11:28 +02:00
Javier Segarra	c443b0a00f	feat: input validations	2024-05-14 10:50:29 +02:00
Javier Segarra	20f9b53afb	Merge branch 'dev' into 7271-EndZoneMigration	2024-05-14 10:42:43 +02:00
Javier Segarra	fa82efe5d2	fix: limit width some fields	2024-05-14 10:41:28 +02:00
Javier Segarra	289bdeecae	fix: Workers/isActive	2024-05-14 10:41:07 +02:00
Javier Segarra	dcbf2eb837	Merge pull request 'Monitors' (!364) from hyervoni/salix-front-mindshore:feature/Monitors into dev ... Reviewed-on: #364 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-13 16:02:29 +00:00
Javier Segarra	32e715ce6b	Merge branch 'dev' into feature/Monitors	2024-05-13 17:59:39 +02:00
William Buezas	7b99d2f38b	re order translation	2024-05-13 10:31:11 -03:00
William Buezas	8e7b043a46	Resolve conflicts	2024-05-13 10:28:21 -03:00
Javier Segarra	1181cd0daa	Merge branch 'dev' into 7271-EndZoneMigration	2024-05-13 12:15:50 +00:00
Javier Segarra	a94c1a32e1	fix: show label agency instead id	2024-05-13 14:13:41 +02:00
Jorge Penadés	cde918744d	Merge pull request '#5919 locker' (!338) from 5919-locker into dev ... Reviewed-on: #338 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-13 12:08:47 +00:00
Jorge Penadés	0b83d3663f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-13 13:20:15 +02:00
Jon Elias	14910c5899	feat: refs #7271 basicData and Log	2024-05-13 12:46:25 +02:00
Javier Segarra	4fb4cb9298	Merge pull request 'ZoneList and ZoneSummary' (!365) from hyervoni/salix-front-mindshore:feature/ZoneList into dev ... Reviewed-on: #365 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-13 08:00:21 +00:00
Alex Moreno	0ed3cafcab	Merge branch 'dev' into feature/ZoneList	2024-05-13 07:31:17 +00:00
Alex Moreno	a28d18f1e1	fix: redirection when clone and styles	2024-05-13 09:30:03 +02:00
Jorge Penadés	f08a7a2e9d	Merge branch '5919-locker' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-13 08:55:14 +02:00
Jorge Penadés	ad14d2e776	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-13 08:55:03 +02:00
Javier Segarra	05698af75d	Merge branch 'dev' into 5919-locker	2024-05-13 06:47:54 +00:00
Javier Segarra	722373fd99	Merge branch 'dev' into feature/Monitors	2024-05-13 06:47:41 +00:00
Jorge Penadés	cd0dd6a735	feat: refs #5919 changeLog	2024-05-10 16:12:52 +02:00
Jorge Penadés	a692ca4a18	feat: refs #5919 test & set workerFk null.	2024-05-10 16:01:32 +02:00
Jon Elias	e0bb8da47f	Merge pull request 'refactor: refs #6767 deleted <div class="col">' (!302) from 6767-deleteDivCol into dev ... Reviewed-on: #302 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-05-10 12:40:53 +00:00
Jorge Penadés	7fd4c43b8b	feat: refs #5919 workerlocker	2024-05-10 13:07:58 +02:00
Jon Elias	2183385e58	Merge branch 'dev' into 6767-deleteDivCol	2024-05-10 09:39:31 +00:00
Javier Segarra	daf1d4de2d	style changes	2024-05-10 08:51:47 +02:00
Javier Segarra	cb24ac81ff	Merge branch 'dev' into feature/ZoneList	2024-05-10 08:46:00 +02:00
Javier Segarra	049564f443	fix: Descriptor	2024-05-10 08:45:38 +02:00
Javier Segarra	1100588af5	fix: minor size icons	2024-05-10 08:40:56 +02:00
Javier Segarra	2697078a55	feat: Replace CarList by Table	2024-05-10 08:40:47 +02:00
Jorge Penadés	626a369f84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-10 08:35:42 +02:00
Javier Segarra	7f185c091b	feat: add descriptor	2024-05-10 08:13:02 +02:00
William Buezas	7216b90a3e	Fix filter panel bug	2024-05-09 15:13:45 -03:00
Javier Segarra	f374fe859d	Merge branch 'feature/Monitors' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/Monitors	2024-05-09 17:46:28 +02:00
Javier Segarra	104ea5b8e5	feat: refreshInterval	2024-05-09 17:46:24 +02:00
William Buezas	d227d4b09b	Zone create	2024-05-09 11:32:04 -03:00
William Buezas	b4f983b946	Add searchbar	2024-05-09 09:15:52 -03:00
William Buezas	7cc5c0bdbd	Fix client table initial request	2024-05-09 08:40:09 -03:00
Javier Segarra	a6ec40beb4	fix: style second row	2024-05-09 13:32:03 +02:00
Javier Segarra	2df0c1eba9	fix: ticketsMonitor title	2024-05-09 13:26:53 +02:00
William Buezas	9b9e482fa7	Zone list and Zone summary	2024-05-09 08:21:30 -03:00
Carlos Satorres	fcb6f8dd49	Merge pull request '#6877 - itemRequestMod' (!362) from 6877-itemRequestMod into dev ... Reviewed-on: #362 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-09 10:55:03 +00:00