2954 Commits

All Branches

Search

Author	SHA1	Message	Date
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	861e4385bb	Merge branch 'dev' into feature/ItemsSummary	2024-04-24 07:34:49 +02:00
William Buezas	f3b5bf7f4b	Item list filter	2024-04-23 15:34:52 -03:00
Alex Moreno	7dd8835716	Merge pull request 'refs #6551 feature/WorkerTimeControl' (!254) from hyervoni/salix-front-mindshore:feature/WorkerTimeControl into dev ... Reviewed-on: #254 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-23 13:12:51 +00: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	dc1444641d	Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests	2024-04-23 14:13:19 +02:00
William Buezas	4396f7d6ba	Fill thumb_down icon on hover	2024-04-23 09:13:10 -03:00
Javier Segarra	4f475a045d	Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests	2024-04-23 14:12:15 +02:00
William Buezas	81a630d6cd	Add more translations	2024-04-23 09:10:28 -03:00
William Buezas	b7ba664e45	WIP	2024-04-23 09:05:34 -03:00
Javier Segarra	9a78b8ac3b	Merge branch 'dev' into feature/ItemRequests	2024-04-23 13:55:43 +02: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
Javier Segarra	4049fa5c4a	feat: #6321 replace dialog into layout	2024-04-23 12:50:34 +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	c99a7bed22	Merge pull request 'refactor: refs #7239 changed translations' (!311) from 7239-changeTranslations into dev ... Reviewed-on: #311 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-23 09:46:13 +00:00
Jon Elias	02637556fb	Merge branch 'dev' into 7239-changeTranslations	2024-04-23 09:45:25 +00:00
Javier Segarra	46aefa67d1	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-04-23 11:45:00 +02:00
Jorge Penadés	ba6a5d2fd2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-23 11:09:25 +02:00
Pablo Natek	ecbde3a536	Merge pull request 'fix: slow test on skipped comment all test' (!316) from fixSlowTest into dev ... Reviewed-on: #316 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-23 09:06:36 +00:00
Pablo Natek	948440ebc4	fix: slow test on skipped comment all test	2024-04-23 10:23:21 +02: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
Alex Moreno	1c137bea4d	deploy: refs #7253 init version 2420	2024-04-23 10:15:46 +02:00
Alex Moreno	b265f9f705	Merge pull request '7253-devToTest_2418' (!315) from 7253-devToTest_2418 into test ... Reviewed-on: #315 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-23 08:12:46 +00:00
Carlos Satorres	5cce1df708	refs #6976 fix supplierConsumption	2024-04-23 10:06:57 +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
Pablo Natek	833f5e48a8	Merge pull request 'tests cypress' (!314) from fixCypressE2E into dev ... Reviewed-on: #314 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-23 07:39:59 +00:00
Pablo Natek	f85c44e1e2	Merge branch 'dev' into fixCypressE2E	2024-04-23 07:39:01 +00:00
Jon Elias	23ae47b5a5	fix e2e and skip claim photo	2024-04-23 09:38:03 +02:00
Alex Moreno	efbaa63e29	Merge pull request 'fix(VnNotes): refs #6336 VnAvatar' (!313) from 6336_fix_vn_notes_VnAvatar into dev ... Reviewed-on: #313 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-04-23 07:24:41 +00:00
Alex Moreno	9cb662b6f5	Merge branch 'dev' into 6336_fix_vn_notes_VnAvatar	2024-04-23 07:22:34 +00:00
Jon Elias	450d4a0dc4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fixCypressE2E	2024-04-23 09:20:11 +02: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	5f05ab93df	Merge pull request 'warmFix_hasMoreData' (!308) from warmFix_hasMoreData into dev ... Reviewed-on: #308 Reviewed-by: Jorge Penades <jorgep@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-23 07:12:54 +00:00
Jon Elias	d710d736ca	tests cypress	2024-04-23 08:40:30 +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
Jon Elias	781e863aca	Merge branch 'dev' into 7239-changeTranslations	2024-04-23 05:16:34 +00:00
Jon Elias	87ce1f0217	Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations	2024-04-23 07:15:41 +02:00
Jon Elias	4ddcbaeacd	refactor: refs #7239 fixed errors	2024-04-23 07:15:39 +02:00
Pablo Natek	663c093a00	feat: refs #4988 agency e2e	2024-04-22 18:17:01 +02:00
Jorge Penadés	3abc504158	fix: unit test	2024-04-22 16:35:34 +02:00
William Buezas	e11625e05f	set columns default attrs to avoid repeating code	2024-04-22 11:30:16 -03:00