1016 Commits

Author	SHA1	Message	Date
Javier Segarra	57736654f1	Merge branch 'dev' into feature/ItemFamily	2024-05-02 07:38:41 +00:00
Alex Moreno	f3387cf120	fix: refs #6336 fix reload and disable button when is loading	2024-04-30 12:39:50 +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
Javier Segarra	e01b988ee8	Merge branch 'dev' into feature/ItemFamily	2024-04-29 11:46:56 +02:00
Javier Segarra	7e2ec588c5	fix: remove Warning	2024-04-29 11:24:20 +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	19fcacebc9	perf: VnSearchbar	2024-04-29 10:12:19 +02:00
Javier Segarra	955e196882	fix: filterPanelbug	2024-04-26 17:43:57 +02:00
Javier Segarra	a03049a721	fix: poc	2024-04-26 17:26:18 +02:00
Javier Segarra	0d50944c2d	fix: add exprBuilder	2024-04-26 15:24:44 +02:00
Javier Segarra	c1ed4ab032	fix: add exprBuilder	2024-04-26 14:49:54 +02:00
Javier Segarra	98846bbd1a	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 09:28:40 +02:00
Javier Segarra	7f4155cde9	fix: replace VnSelectFilter by VnSelect	2024-04-26 08:54:26 +02:00
Carlos Satorres	7fd053b842	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-fixUserPanel	2024-04-26 08:36:15 +02:00
Jon Elias	c56b6b2dbc	refactor: better syntax	2024-04-26 08:22:08 +02:00
Javier Segarra	3116bf0944	Merge branch 'dev' into feature/ItemRequests	2024-04-26 06:21:36 +00:00
Jon Elias	443f4a4443	refactor: refs #7239 changed spanish translations	2024-04-26 07:49:28 +02:00
Alex Moreno	08a40e13f9	Merge branch 'dev' into 6764-rename-VnSelectFilter	2024-04-25 12:10:32 +00:00
jcasado	13d38c8b02	refactor: refs #6764 fix conflicts	2024-04-25 09:02:24 +02:00
jcasado	c6c925a105	refs: #6764 fixConflicts	2024-04-25 08:50:12 +02:00
jcasado	4b3df372cd	refs: #6764 fixConflicts	2024-04-25 08:49:40 +02:00
jcasado	aa58838ad7	refs: #6764 rename VnSelect	2024-04-25 08:34:40 +02:00
Javier Segarra	e65ffb63c9	Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests	2024-04-24 14:26:12 +02:00
Javier Segarra	299838bfa5	Merge branch 'dev' into feature/ItemsSummary	2024-04-24 14:23:49 +02:00
Carlos Satorres	6961a048e5	refs #6905 fix bank select	2024-04-24 13:29:32 +02:00
Jon Elias	82300fd292	refactor: refs #7239 changed french translations	2024-04-24 11:31:37 +02:00
Javier Segarra	de91364ee8	Merge remote-tracking branch 'origin/dev' into feature/FixedPrices	2024-04-24 09:33:34 +02:00
Jorge Penadés	d93963e2c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-24 08:48:43 +02:00
Alex Moreno	1206cc2292	warmFix: duplicated button after merge min	2024-04-24 08:11:33 +02:00
jcasado	716dd4e28f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6764-rename-VnSelectFilter	2024-04-24 08:02:19 +02:00
Javier Segarra	1ea74d0639	fix: minor updates	2024-04-24 07:55:01 +02:00
Javier Segarra	e259a38214	Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests	2024-04-23 14:23:28 +02:00
William Buezas	672bc9ca9d	Change form model popup buttons order	2024-04-23 09:18:28 -03:00
Javier Segarra	bfb7dfb472	Merge branch 'dev' into feature/WorkerTimeControl	2024-04-23 13:31:41 +02:00
jcasado	7f07b9780c	refs: #6764 rename VnSelectFilter	2024-04-23 13:03:32 +02:00
Jorge Penadés	c8b08b9e2d	fix: refs #6480 fix workerCard	2024-04-23 12:34:38 +02:00
Jorge Penadés	f8c238f443	fix: refs #6480 fix workerCard	2024-04-23 12:04:24 +02:00
Jorge Penadés	f9a88ea8c2	fix: refs #6480 fix workerCard	2024-04-23 12:00:29 +02:00
Jorge Penadés	54f9cf36c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-23 11:49:06 +02:00
Jon Elias	02637556fb	Merge branch 'dev' into 7239-changeTranslations	2024-04-23 09:45:25 +00:00
Jon Elias	f21fcc8959	Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations	2024-04-23 10:15:56 +02:00
Jon Elias	fe600d9318	refactor: refs #7239 requested changes	2024-04-23 10:15:54 +02:00
Jorge Penadés	a3ce0440e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-23 09:53:38 +02:00
Alex Moreno	9cb662b6f5	Merge branch 'dev' into 6336_fix_vn_notes_VnAvatar	2024-04-23 07:22:34 +00:00
Jorge Penadés	f3c1608403	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-23 09:17:41 +02:00
Jorge Penadés	498b8b3315	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData	2024-04-23 08:39:33 +02:00
Alex Moreno	20ec141237	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-23 07:39:15 +02:00