2961 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	e4f787f2fa	Merge branch 'dev' into feature/ItemDiary	2024-05-02 08:28:00 +00:00
Carlos Satorres	e685b58adf	Merge pull request 'refs #7172 change vnselectfilter' (!274) from 7172-fixClaimBasicData into dev ... Reviewed-on: #274 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 08:23:21 +00:00
Carlos Satorres	73ade834e9	Merge branch 'dev' into 7172-fixClaimBasicData	2024-05-02 08:21:43 +00:00
Javier Segarra	494f0be44a	Merge branch 'dev' into feature/ItemDiary	2024-05-02 08:13:41 +00:00
Javier Segarra	6482f5680d	Merge pull request '#7190 - Renew tokenMultimedia' (!278) from 7190_renewTokenMultimedia into dev ... Reviewed-on: #278 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 08:11:08 +00:00
Javier Segarra	94fc856bea	Merge branch 'dev' into feature/ItemDiary	2024-05-02 08:05:17 +00:00
Javier Segarra	b530101cda	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-05-02 07:44:20 +00:00
Javier Segarra	43093cfa7d	Merge pull request 'Item types' (!319) from hyervoni/salix-front-mindshore:feature/ItemFamily into dev ... Reviewed-on: #319 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 07:39:58 +00:00
Javier Segarra	57736654f1	Merge branch 'dev' into feature/ItemFamily	2024-05-02 07:38:41 +00:00
Alex Moreno	2c4cd56102	Merge pull request 'fix: refs #6336 fix reload and disable button when is loading' (!340) from 6336-claims_v4_action into dev ... Reviewed-on: #340 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-04-30 13:01:09 +00:00
Alex Moreno	f3387cf120	fix: refs #6336 fix reload and disable button when is loading	2024-04-30 12:39:50 +02:00
Carlos Satorres	acb4e2d98e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData	2024-04-30 09:44:06 +02:00
Alex Moreno	34797450af	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-30 07:59:14 +02:00
Alex Moreno	6a03038c3a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-04-30 07:58:56 +02:00
Alex Moreno	2dfb2300a2	hotFix: refs #6336 fix vnLog user?.id	2024-04-30 07:51:22 +02:00
Alex Moreno	0abc31d96d	Merge pull request 'feat: refs #6336 v4' (!334) from 6336-claims_v4 into dev ... Reviewed-on: #334 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-30 05:38:37 +00:00
Alex Moreno	8390a8b7b0	Merge branch 'dev' into 6336-claims_v4	2024-04-30 05:37:46 +00:00
William Buezas	ccac3a54f9	move translations	2024-04-29 17:39:37 -03:00
William Buezas	1b619055eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemDiary	2024-04-29 10:32:53 -03:00
William Buezas	bd5bf2419b	Merge branch 'feature/ItemFamily' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemFamily	2024-04-29 08:23:50 -03:00
William Buezas	6276c433d1	Fix exprBuilder	2024-04-29 08:23:29 -03:00
Javier Segarra	f713b830ee	Merge branch 'feature/ItemFamily' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemFamily	2024-04-29 11:47:02 +02:00
Javier Segarra	e01b988ee8	Merge branch 'dev' into feature/ItemFamily	2024-04-29 11:46:56 +02:00
Javier Segarra	761bc7724f	fix: redirect	2024-04-29 11:46:40 +02:00
Javier Segarra	0fff6cd446	perf: VnCard	2024-04-29 11:46:33 +02:00
Javier Segarra	7e2ec588c5	fix: remove Warning	2024-04-29 11:24:20 +02:00
Javier Segarra	2f55272df7	fix: WorkerDescriptor	2024-04-29 11:23:50 +02:00
Alex Moreno	b71aeb1d07	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-29 10:39:44 +02:00
Alex Moreno	5378ed6f2e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-04-29 10:34:48 +02:00
Javier Segarra	1e23666943	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-29 08:33:53 +00:00
Javier Segarra	6c69c44dfd	remove comment	2024-04-29 08:33:38 +00:00
Alex Moreno	806f3a13d5	fix(claimLines): refs #6336 fix total calc	2024-04-29 10:33:32 +02:00
Javier Segarra	0e66f08674	Merge branch 'dev' into feature/ItemFamily	2024-04-29 10:22:03 +02:00
Javier Segarra	34c8874468	fix: i18n	2024-04-29 10:17:18 +02:00
Javier Segarra	8c3d32ec86	fix: remove VnFilterPanel inside Summary	2024-04-29 10:12:50 +02:00
Javier Segarra	bdc5d7210f	fix: remove redirect	2024-04-29 10:12:37 +02:00
Javier Segarra	19fcacebc9	perf: VnSearchbar	2024-04-29 10:12:19 +02:00
Carlos Satorres	abd1f72340	Merge branch '7172-fixClaimBasicData' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData	2024-04-29 09:49:32 +02:00
Carlos Satorres	a78c920ec8	refs #7172 fix VnSelect	2024-04-29 09:49:29 +02:00
Carlos Satorres	76a1227c0e	Merge branch 'dev' into 7172-fixClaimBasicData	2024-04-29 07:38:59 +00:00
Carlos Satorres	e3237ee4f1	refs #7172 refact VnSelect	2024-04-29 09:35:57 +02:00
Alex Moreno	8b55044891	feat: refs #6336 add ItemDescriptor	2024-04-29 08:56:35 +02:00
Javier Casado	e757fff4dd	Merge pull request 'refs #6641 add checkbox' (!283) from 6641-myTeamFilterClaim into dev ... Reviewed-on: #283 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-29 06:49:07 +00:00
Javier Casado	fe22fb26fb	Merge branch 'dev' into 6641-myTeamFilterClaim	2024-04-29 06:47:55 +00:00
Javier Segarra	1c435725f2	Merge branch 'dev' into feature/ItemFamily	2024-04-29 08:23:11 +02:00
Javier Segarra	9a840c9cee	Merge branch 'dev' into feature/ItemFamily	2024-04-29 06:03:50 +00:00
Javier Segarra	4d0b9707cf	Merge pull request 'feature/ItemListFilter' (!324) from hyervoni/salix-front-mindshore:feature/ItemListFilter into dev ... Reviewed-on: #324 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-29 06:02:41 +00:00
Javier Segarra	f83ef4eb4c	Merge branch 'dev' into feature/ItemListFilter	2024-04-29 06:02:02 +00:00
Alex Moreno	fdd088955b	Merge pull request 'Item Barcode' (!333) from hyervoni/salix-front-mindshore:feature/ItemBarCode into dev ... Reviewed-on: #333 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-29 05:24:59 +00:00
William Buezas	322ad816b9	item diary	2024-04-28 19:37:44 -03:00