2510 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	7ed505bde8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-03 16:30:10 +02:00
Alex Moreno	dec71dbf62	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-04-03 16:29:40 +02:00
William Buezas	4ee8c45fdc	resolve conflicts	2024-04-03 11:22:52 -03:00
Pablo Natek	c0ed8da0b7	remove space	2024-04-03 15:02:31 +02:00
Jon Elias	94b177c9a2	fix: refs #6425 fix yml format	2024-04-03 14:33:47 +02:00
William Buezas	64b1083619	Add today date	2024-04-03 09:28:38 -03:00
Jon Elias	3e423867e3	fix: refs #6425 fix yml format	2024-04-03 13:12:00 +02:00
William Buezas	bfee37b631	WIP	2024-04-03 08:08:54 -03:00
Jon Elias	9a160d9248	refactor: refs #6425 merged changes	2024-04-03 12:57:23 +02:00
Jon Elias	cb31c2baa2	refs: #6425 merge conflicts	2024-04-03 12:56:56 +02:00
Jon Elias	fb795f65ee	refactor: refs #6425 test changes	2024-04-03 09:49:15 +02:00
William Buezas	fc87bb8293	Add page title name	2024-04-02 13:04:28 -03:00
William Buezas	507c979cc2	Remove unused reactive import	2024-04-02 12:48:14 -03:00
William Buezas	3569afdb85	Update fetch-data name	2024-04-02 12:46:50 -03:00
William Buezas	71b2f7c8dc	Remove col divs	2024-04-02 12:43:32 -03:00
William Buezas	addbe9345b	Resolve conflicts	2024-04-02 12:40:26 -03:00
William Buezas	3055db8ef8	Delete file	2024-04-02 12:32:15 -03:00
William Buezas	146d3e87db	Change calendar extension	2024-04-02 12:29:31 -03:00
Pablo Natek	f18cefd999	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7128-copyStyles	2024-04-02 14:12:58 +02:00
Jon Elias	33c54042df	refactor: refs #6425 translation files in .yml format and minor changes	2024-04-02 14:12:01 +02:00
Pablo Natek	c66be3c2b5	feat #7128 fix styles	2024-04-02 14:04:09 +02:00
Kevin Martinez	47a588fff4	Update WorkerCalendarItem	2024-04-02 09:00:15 -03:00
Pablo Natek	148224344d	feat(style): refs #7128 add style	2024-04-02 10:46:27 +02:00
Jon Elias	1316fe3896	Merge branch 'dev' into 7130-addFieldInRoutes	2024-04-02 05:14:15 +00:00
William Buezas	239daceca6	Apply changes in Worker PBX	2024-03-28 13:45:35 -03:00
Jon Elias	37d869d1d5	refactor: refs #7130 requested changes	2024-03-28 12:19:55 +01:00
Alex Moreno	bed0b9e8e9	Merge pull request '#6951 warmfix ticketDescriptor' (!263) from 6951-warmfix_ticketDescriptor into test ... Reviewed-on: #263 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 09:09:09 +00:00
Jorge Penadés	7020fab851	fix: refs #6951 drop hook & change selector	2024-03-28 09:46:18 +01:00
Alex Moreno	87825daa8e	refs #7152 deploy: init version 24.16	2024-03-28 09:23:12 +01:00
Alex Moreno	9ed8fa1bcb	Merge pull request '7152-devToTest_2414' (!262) from 7152-devToTest_2414 into test ... Reviewed-on: #262 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-03-28 08:20:23 +00:00
Alex Moreno	2d3ddd886a	Merge pull request 'feat: #6514 create supplierDms lilium' (!258) from 6514-gestDocSupplier into dev ... Reviewed-on: #258 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:33:19 +00:00
Jon Elias	2b1fe6fd77	Merge branch '6514-gestDocSupplier' of https://gitea.verdnatura.es/verdnatura/salix-front into 6514-gestDocSupplier	2024-03-28 08:31:57 +01:00
Jon Elias	b2691a35e1	refactor: refs #6514 fixed tranlation	2024-03-28 08:31:56 +01:00
Alex Moreno	181bff6c0c	Merge branch 'dev' into 6514-gestDocSupplier	2024-03-28 07:17:28 +00:00
Javier Segarra	54b6528962	Merge pull request 'More updates to use scopedMultimedia' (!261) from 6930_scopedMultimedia into dev ... Reviewed-on: #261 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 06:38:25 +00:00
Javier Segarra	da93b9cca8	updates	2024-03-28 07:20:54 +01:00
William Buezas	0d6d18b8c8	Apply VnDmsList component and add docuware action	2024-03-27 20:33:35 -03:00
Kevin Martinez	0dee7e8cc9	Create worker calendar submodule	2024-03-27 16:51:44 -03:00
William Buezas	37465ffa4a	resolve conflicts	2024-03-27 11:23:54 -03:00
carlosfonseca	8cf14929e3	Se implementa nuevo componente para la gestion de notas	2024-03-27 08:52:31 -05:00
Alex Moreno	f0ccb526f0	Merge pull request 'refs #7147 add value' (!260) from 7147-hotfixLanguage into master ... Reviewed-on: #260 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-27 12:40:35 +00:00
Carlos Satorres	e651e116e7	refs #7147 add value	2024-03-27 13:36:51 +01:00
Jorge Penadés	2bec5f0e9c	Merge pull request '#6893 redirect on fetch just one record' (!257) from 6893-redirectOnFetchOneRecord into dev ... Reviewed-on: #257 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-27 12:14:23 +00:00
Jon Elias	72e3fcb4b7	Merge pull request 'refactor: #6988 changed ticket summary view and fixed notes functionality' (!237) from 6988-SummaryRefactor into dev ... Reviewed-on: #237 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-27 10:51:51 +00:00
Jorge Penadés	5126b6aed8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord	2024-03-27 11:48:56 +01:00
Jorge Penadés	0d74c7f6c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord	2024-03-27 11:18:41 +01:00
Jorge Penadés	20102a89ab	feat: refs #6893 improve VnSearchbar & create tests	2024-03-27 11:14:54 +01:00
Jon Elias	d555f7e09e	Merge branch 'dev' into 6988-SummaryRefactor	2024-03-27 10:02:18 +00:00
Jorge Penadés	a9f7cfb8d4	Merge pull request '#5186 create parking section' (!197) from 5186-CreateParkingSection into dev ... Reviewed-on: #197 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-27 08:42:32 +00:00
Javier Segarra	27f8d5f09c	Merge branch '5186-CreateParkingSection' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection	2024-03-27 09:36:19 +01:00