3245 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Javier Segarra	4fdf2bacf8	fix: pvp tooltip	2024-05-01 13:52:45 +02:00
Javier Segarra	4ef7b0e17c	fix: item routes order	2024-05-01 13:31:32 +02:00
Javier Segarra	d2531efdd6	fix: Botanical icon	2024-05-01 13:27:40 +02:00
William Buezas	72ad524c68	change prop names	2024-04-30 16:23:19 -03:00
William Buezas	0890de3771	change prop name	2024-04-30 16:21:06 -03:00
William Buezas	2e85b9c063	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemLastEntries	2024-04-30 16:19:06 -03:00
William Buezas	ac219bfbb7	Item shelvings	2024-04-30 16:15:48 -03: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	38cd54a7f0	refs #6895 remove autoload	2024-04-30 12:10:30 +02:00
Javier Segarra	a512f094d6	perf: ZoneDescriptor	2024-04-30 12:06:24 +02:00
Jon Elias	9563a1a6ed	Merge branch 'dev' into 6887-endClaimMigration	2024-04-30 08:35:35 +00:00
Jon Elias	d5762f65b3	refactor: refs #6887 fixed errors	2024-04-30 10:34:48 +02:00
Jon Elias	5b15558dbf	refactor: refs #6887 fixed errors	2024-04-30 10:32:32 +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
Javier Segarra	3cb662d406	Merge branch 'dev' into feature/ItemTax	2024-04-30 07:29:07 +00: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
Javier Segarra	d92a0ba77e	fix: Roadmap Summary ID	2024-04-30 07:46:57 +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	ac9063e166	Item Last entries	2024-04-29 17:01:26 -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
Javier Segarra	4be559bbe8	fix: hansChanges to false	2024-04-29 15:16:37 +02:00
William Buezas	0b5aea76d9	Move translations	2024-04-29 09:39:04 -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	a5d6ca447b	fix: TicketSummary.packages label	2024-04-29 12:12:20 +02:00
Javier Segarra	b3aaf35c6a	Merge branch 'dev' into 6887-endClaimMigration	2024-04-29 09:58:26 +00: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
Jon Elias	b8380bc9c5	Merge branch 'dev' into 6887-endClaimMigration	2024-04-29 07:51:16 +00:00