3177 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	df911e0210	feat: itemProposal selection	2024-05-14 09:55:36 +02:00
Javier Segarra	ad64ee4755	feat: change Qdialog sizing	2024-05-14 08:45:46 +02:00
Javier Segarra	3e39ab7fc2	Merge branch '6321_negative_tickets' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets	2024-05-13 13:51:18 +02:00
Javier Segarra	e6b360ee4b	fix: vnfilterPanel	2024-05-13 13:51:15 +02:00
Jorge Penadés	99ea8e843c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets	2024-05-13 13:22:39 +02:00
Javier Segarra	ebdc1e9906	updates	2024-05-13 13:18:22 +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
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
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
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
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
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
Javier Segarra	0eab0a9a98	feat: #6321 Modals change qty and state	2024-05-08 15:35:04 +02:00
Javier Segarra	881e059121	feat: #6321 Show Free lines	2024-05-08 14:06:23 +02:00
Javier Segarra	0984d05220	Merge branch 'fix_minor_styles' into 6321_negative_tickets	2024-05-08 13:44:40 +02: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
Javier Segarra	61519595a9	Merge branch 'dev' into 6321_negative_tickets	2024-05-08 12:30:01 +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
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
Carlos Satorres	1b65ec7c38	refs #6877 fix filterdate	2024-05-08 09:39:26 +02:00
Javier Segarra	6efd03dc0c	Merge pull request '#7271 - Zones Boilerplate' (!327) from 7271_boilerplate_zones into dev ... Reviewed-on: #327 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-08 06:17:41 +00:00
Javier Segarra	ccc87a0958	Merge branch 'dev' into 7271_boilerplate_zones	2024-05-08 07:52:59 +02:00
Javier Segarra	9a6dd65774	feat: remove deprecatedHour fn	2024-05-08 07:52:18 +02:00
Jorge Penadés	613492d04a	Merge pull request 'fix conflicts' (!361) from testToDev into dev ... Reviewed-on: #361 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-07 14:37:08 +00:00
Jorge Penadés	392d1892ba	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev	2024-05-07 16:19:13 +02:00
Jorge Penadés	0e7c2c7118	Merge pull request '#6938-warmfix' (!359) from 6938-warmfix into test ... Reviewed-on: #359 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-07 14:21:13 +00:00
Jorge Penadés	5e0db81a21	fix: refs #6938 conflicts	2024-05-07 15:51:55 +02:00
Jorge Penadés	ac0ebf431f	Merge pull request '#6938 wamfix workerCard' (!357) from 6938-warmfix-masterToTest into test ... Reviewed-on: #357 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-07 13:37:05 +00:00
Jorge Penadés	0a71060f60	fix: refs #6938 workerCard	2024-05-07 15:28:00 +02:00
Alex Moreno	1d9616c25e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-07 14:18:56 +02:00
Alex Moreno	13f8937f12	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-05-07 14:18:36 +02:00
Carlos Satorres	a691644b9a	refs #6877 changes filter date	2024-05-07 13:38:25 +02:00
Javier Segarra	0843d70951	Merge pull request 'Item Shelving' (!343) from hyervoni/salix-front-mindshore:feature/ItemShelving into dev ... Reviewed-on: #343 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-07 10:57:43 +00:00
Alex Moreno	9b31fa5042	Merge branch 'dev' into feature/ItemShelving	2024-05-07 10:54:12 +00:00
Javier Segarra	175746a4a4	Merge pull request 'Item Basic data' (!346) from hyervoni/salix-front-mindshore:feature/ItemBasicData into dev ... Reviewed-on: #346 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-07 10:47:01 +00:00