3855 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	21488cda9e	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7407-workerMedical	2024-06-18 12:07:00 +02:00
Carlos Satorres	879c770296	refs #7407 workerMedical	2024-06-18 12:06:46 +02:00
Alex Moreno	e369ea68d4	fix(VnTable): Qtable v-bind	2024-06-18 09:56:03 +02:00
Alex Moreno	e8054467a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-17 13:00:30 +02:00
Alex Moreno	3394eb10b0	fix(VnFilterPanel): remove key	2024-06-17 12:58:58 +02:00
Alex Moreno	fb1bd5ca72	fix: bug replace	2024-06-17 11:29:36 +02:00
Alex Moreno	a479637ee6	feat: customerList is customerExtendedList	2024-06-17 10:14:11 +02:00
Alex Moreno	bc31985a4d	remove console.log	2024-06-17 09:54:19 +02:00
Alex Moreno	1c6fab0158	fix(VnTable): duplicate fetch	2024-06-17 09:53:36 +02:00
Alex Moreno	6120c98580	fix(VnTable): warns	2024-06-17 08:19:07 +02:00
Alex Moreno	0ad6b260da	fix(VnTable): create scss	2024-06-17 07:32:43 +02:00
Alex Moreno	d9d54a351f	fix(VnTable): showLabel	2024-06-14 14:54:52 +02:00
Alex Moreno	f86bc9791b	fix: fix warnings	2024-06-14 11:49:29 +02:00
Alex Moreno	b282ce540e	remove unnecessay	2024-06-14 11:39:05 +02:00
Alex Moreno	cb87d2b419	fix(VnFilter): filter with params	2024-06-14 11:35:33 +02:00
Alex Moreno	bea756d7cb	feat(vnTable): reload data when change url	2024-06-14 10:53:02 +02:00
Alex Moreno	42042ea3cd	fix: SkeletonTable	2024-06-14 09:19:51 +02:00
Javier Segarra	914a9afb92	Merge pull request 'Fix worker department: Create modal did not open' (!441) from hyervoni/salix-front-mindshore:bugfix/WorkerDepartment into dev ... Reviewed-on: #441 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-13 12:57:40 +00:00
Javier Segarra	7d73cd0e33	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-13 14:56:34 +02:00
Javier Segarra	648546888d	fix: DeleteDepartment VnConfirm	2024-06-13 14:56:19 +02:00
Pablo Natek	78042ab109	Merge pull request 'fix: refs #7499 id article' (!428) from 7499-refactorEntrys into dev ... Reviewed-on: #428 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-13 05:41:26 +00:00
Pablo Natek	e10755d8fe	Merge branch 'dev' into 7499-refactorEntrys	2024-06-13 05:39:13 +00:00
Javier Segarra	ffd4109dc7	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-12 20:23:30 +00:00
William Buezas	b0e4dc99b0	Fix worker department create modal did not open	2024-06-12 08:47:32 -03:00
Guillermo Bonet	9388cb3599	Merge branch 'test' into dev	2024-06-12 12:02:12 +02:00
Guillermo Bonet	135e05b139	hotfix: refs #6636 EN i18n	2024-06-12 12:00:43 +02:00
Alex Moreno	c4cbd7f156	feat(VnTable): is-editable and use-model. fix: checkbox	2024-06-12 11:01:18 +02:00
Javier Segarra	ef24a5cd2f	Merge pull request '#7323 FIX default model value depends on route' (!437) from 7323_fix_workerTimeControl into dev ... Reviewed-on: #437 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-12 07:33:27 +00:00
Javier Segarra	11c0154c48	Merge branch 'dev' into 7323_fix_workerTimeControl	2024-06-12 07:31:51 +00:00
Alex Moreno	11d1fdd80e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-12 08:41:03 +02:00
Alex Moreno	6a19687066	Merge pull request 'feat(jenkinsfile): use build_id' (!438) from jenkinsFile_useBuildIdInVersion into master ... Reviewed-on: #438 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-12 06:21:36 +00:00
Pablo Natek	b7a097fd13	Merge branch 'dev' into 7499-refactorEntrys	2024-06-12 06:16:48 +00:00
Alex Moreno	937f75ec63	feat(jenkinsfile): use build_id	2024-06-12 07:40:04 +02:00
Alex Moreno	048685277f	Merge branch 'dev' into 6825-vnTable	2024-06-12 05:31:31 +00:00
Jon Elias	79e84175a6	Merge pull request '#7154 new item descriptor field' (!436) from 7154-ItemDescriptor into dev ... Reviewed-on: #436 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-12 05:05:33 +00:00
Jon Elias	df364dca4a	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-12 05:04:16 +00:00
Javier Segarra	e9051f1ee8	Merge pull request 'Account views: Accounts, Ldap, Samba' (!426) from hyervoni/salix-front-mindshore:feature/AccountFormsView into dev ... Reviewed-on: #426 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-11 19:14:29 +00:00
Javier Segarra	d0759cb654	Merge branch 'dev' into feature/AccountFormsView	2024-06-11 21:12:13 +02:00
Pablo Natek	a65f5dfe44	fix: refs #7499 use current colors	2024-06-11 16:38:12 +02:00
Alex Moreno	3dfe3226ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-11 15:00:52 +02:00
Alex Moreno	00da1c2808	feat: adapt tu VnTable → CrudModel	2024-06-11 15:00:43 +02:00
Jon Elias	4045a3a631	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 12:56:52 +00:00
Javi Gallego	cb0559fee8	Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #432 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:53:42 +00:00
Pablo Natek	6789f3d1cb	fix: refs #7499 fix style	2024-06-11 14:32:01 +02:00
Jon Elias	2d0b33c626	Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor	2024-06-11 14:29:44 +02:00
Jon Elias	de18b670ea	feat: refs #7154 changed label	2024-06-11 14:29:42 +02:00
Pablo Natek	be919f97b1	Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys	2024-06-11 14:28:20 +02:00
Pablo Natek	80adeede81	fix: refs #7499 fix item reference	2024-06-11 14:28:19 +02:00
Javier Segarra	7ac2aed326	fix: default model value depends on route	2024-06-11 14:09:42 +02:00
Jon Elias	989ea3d82c	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 11:49:25 +00:00