3362 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Javier Segarra	62c66ff952	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-23 08:04:13 +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
Javier Segarra	04fe9330d4	fix: #7190 tests	2024-04-23 08:03:09 +02:00
Javier Segarra	6018d51642	perf: #7190 remove comments	2024-04-23 07:56:07 +02:00
Javier Segarra	74eec098ac	Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia	2024-04-23 07:49:35 +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
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
William Buezas	1398a146ff	Change restOfData to restOfItem	2024-04-22 09:07:48 -03:00
William Buezas	7dac6ba910	Remove unused imports	2024-04-22 09:02:35 -03:00
William Buezas	64fc02e33b	Fix supplier consumption disabled buttons	2024-04-22 09:00:57 -03:00
William Buezas	78561c5f42	Item types	2024-04-22 08:34:38 -03:00
Jon Elias	2e493258fd	Merge branch 'dev' into 7239-changeTranslations	2024-04-22 11:19:15 +00:00
Jon Elias	dd74c7d507	refactor: refs #7239 changed translations	2024-04-22 13:17:22 +02:00
Jorge Penadés	1f391dc49b	fix: skip	2024-04-22 13:17:05 +02:00
Jorge Penadés	80844e7869	fix: hasMoreData	2024-04-22 12:53:09 +02:00
Pablo Natek	43aadd4fc6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-22 12:22:04 +02:00
Pablo Natek	6b4cb4ed12	feat: refs #4988 add agency section	2024-04-22 12:19:22 +02:00
Carlos Satorres	d2ec47fe1c	refs #6976 total Stems	2024-04-22 11:25:32 +02:00
Jon Elias	3b8761dc7c	refactor: refs #6899 moved css to app.scss	2024-04-22 11:21:28 +02:00
Jon Elias	ab61a68f28	refactor: refs #6899 moved css to app.scss	2024-04-22 11:20:25 +02:00