3122 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	a3f074ea0a	refs #6905 fix data	2024-05-15 10:13:49 +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
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
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	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
Carlos Satorres	349a101680	Merge branch 'dev' into 6877-itemRequestMod	2024-05-09 10:53:27 +00:00
Jorge Penadés	ac935b9020	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-09 08:48:28 +02:00
Alex Moreno	8e529a08dc	Merge pull request 'Fix minor styles' (!363) from fix_minor_styles into dev ... Reviewed-on: #363 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-09 06:20:38 +00:00
William Buezas	a3ce81d66d	Zone list	2024-05-08 15:23:52 -03:00
William Buezas	e74afae5b3	remove padding bottom from some inputs	2024-05-08 12:04:23 -03:00
William Buezas	399c2723a9	change monitor list layout	2024-05-08 10:58:27 -03:00
William Buezas	712d7e13ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors	2024-05-08 10:45:05 -03:00
William Buezas	5bdbbf426a	Tables development	2024-05-08 10:43:18 -03:00
Javier Segarra	0ebb9c6c52	fix: unnexpected bottom spca	2024-05-08 13:43:45 +02:00
Javier Segarra	fdd94b09f3	style: fix searchba input width	2024-05-08 11:43:18 +00:00
Carlos Satorres	26506c1f9f	refs #6877 remove update	2024-05-08 13:27:42 +02:00
Carlos Satorres	c18d035be5	Merge pull request 'refs #6842 isFreelance' (!348) from 6842-errorCalendar into dev ... Reviewed-on: #348 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 10:21:28 +00:00
Jorge Penadés	a1f785ccbe	feat: refs #5919 WIP workerlocker	2024-05-08 11:02:40 +02:00
Jorge Penadés	dec9b924eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-08 10:36:03 +02:00
Carlos Satorres	3d3f72757a	Merge branch 'dev' into 6842-errorCalendar	2024-05-08 08:10:37 +00:00
Alex Moreno	e4af4d3e4a	Merge pull request 'Item tags' (!350) from hyervoni/salix-front-mindshore:feature/ItemTags into dev ... Reviewed-on: #350 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-08 08:03:55 +00:00
Alex Moreno	d69b362407	Merge branch 'dev' into feature/ItemTags	2024-05-08 08:02:55 +00:00