2760 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	42591d0781	feat #7271 router	2024-04-25 14:27:56 +02:00
Javier Segarra	331484dbc7	Merge pull request 'Item Fixed prices' (!307) from hyervoni/salix-front-mindshore:feature/FixedPrices into dev ... Reviewed-on: #307 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-24 07:39:22 +00:00
Javier Segarra	8bb3d48c81	Merge branch 'dev' into feature/FixedPrices	2024-04-24 07:37:39 +00:00
Jon Elias	bda232f1c3	Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!304) from 6899-endInvoiceOutMigration into dev ... Reviewed-on: #304 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-24 07:36:51 +00:00
Javier Segarra	de91364ee8	Merge remote-tracking branch 'origin/dev' into feature/FixedPrices	2024-04-24 09:33:34 +02:00
Jon Elias	39685c222f	refactor: refs #6899 fixed css and minor changes	2024-04-24 09:14:35 +02:00
Jon Elias	ca3b280dcb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899-endInvoiceOutMigration	2024-04-24 09:06:24 +02:00
Jorge Penadés	77798cbae4	Merge pull request '#6480 improve Card' (!271) from 6480-improveCard into dev ... Reviewed-on: #271 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-24 06:57:38 +00: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
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	bfb7dfb472	Merge branch 'dev' into feature/WorkerTimeControl	2024-04-23 13:31:41 +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
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
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
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
Javier Segarra	13a46be85b	fix: tests	2024-04-22 15:18:15 +02:00
Alex Moreno	952d5bf543	fix(VnNotes): refs #6336 VnAvatar	2024-04-22 15:03:10 +02:00
Alex Moreno	72deeab2ef	Merge branch 'dev' into warmFix_hasMoreData	2024-04-22 13:01:28 +00:00
Javier Segarra	036dcaadd2	Merge pull request 'bugfix/SupplierConsumptionDateRanges' (!312) from hyervoni/salix-front-mindshore:bugfix/SupplierConsumptionDateRanges into dev ... Reviewed-on: #312 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-22 12:48:00 +00:00
William Buezas	c9767e7b1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into bugfix/SupplierConsumptionDateRanges	2024-04-22 09:45:01 -03:00
William Buezas	dce48b536d	Change in newPrice assign	2024-04-22 09:42:28 -03:00
William Buezas	2105d7870b	Refactor isBigger and isLower	2024-04-22 09:38:16 -03:00
Alex Moreno	9d381a5c82	Merge pull request 'fix(VnNotes): refs #6336 fix v-for key' (!310) from 6336_fix_vn_notes_key into dev ... Reviewed-on: #310 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-04-22 12:09:19 +00:00