1601 Commits

All Branches

Search

Author	SHA1	Message	Date
carlosfonseca	bd8acbe084	Correcciones solicitadas	2024-01-04 13:12:58 -05:00
Carlos Fonseca	083094b25d	Merge pull request 'Mejoras en las correcciones de codigo' (#57) from branch-PR-2-fixies-2 into branch-PR-2 ... Reviewed-on: hyervoni/salix-front-mindshore#57	2024-01-04 16:43:00 +00:00
carlosfonseca	6b3bed0085	Mejoras en las correcciones de codigo	2024-01-04 11:37:46 -05:00
Carlos Fonseca	fb7a3c208c	Merge pull request 'Se hacen correcciones en base a comentarios en el PR' (#56) from branch-PR-2-fixes into branch-PR-2 ... Reviewed-on: hyervoni/salix-front-mindshore#56	2024-01-04 15:25:33 +00:00
carlosfonseca	64777bb804	Se hacen correcciones en base a comentarios en el PR	2024-01-04 10:23:55 -05:00
Pablo Natek	11a37b7716	Merge branch 'dev' into 6259-ticketSmsToClientSms	2024-01-04 14:47:46 +00:00
William Buezas	3ba4e56204	merge with dev	2024-01-04 11:19:40 -03:00
Carlos Satorres	7ae05f23fc	refs #6420 notes	2024-01-04 14:38:33 +01:00
William Buezas	cfac9acbe8	Small corrections	2024-01-04 09:58:37 -03:00
William Buezas	de8996d596	Fixes PR	2024-01-04 09:34:24 -03:00
Carlos Satorres	d30d16bced	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6420-claimNotesSummary	2024-01-04 12:23:09 +01:00
Alex Moreno	a7289602cc	Merge pull request '6618-vnSubToolBar' (!143) from 6618-vnSubToolBar into dev ... Reviewed-on: #143 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-04 09:56:50 +00:00
Carlos Satorres	83cfd8e4da	Merge branch 'dev' into 6618-vnSubToolBar	2024-01-04 09:33:24 +00:00
Carlos Satorres	96acd00469	refs #6618 remove import	2024-01-04 10:33:11 +01:00
Alex Moreno	4306226e5c	refs #6635 feat: correct version	2024-01-04 08:08:28 +01:00
Kevin Martinez	b622f9cca7	Add order orderBy filter	2024-01-04 02:27:43 -04:00
Kevin Martinez	5e9006bf33	Fix travel summary cards	2024-01-04 00:58:08 -04:00
William Buezas	bdbc3209f4	Merge pull request 'feature/ms-114-ImproveExtendedListFilters' (#53) from feature/ms-114-ImproveExtendedListFilters into dev ... Reviewed-on: hyervoni/salix-front-mindshore#53	2024-01-03 19:58:24 +00:00
William Buezas	aee4696bb2	Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into branch-PR-2	2024-01-03 16:56:11 -03:00
William Buezas	8fc7a5ea12	Aplicar clases a close-icon en el css	2024-01-03 16:55:48 -03:00
Carlos Fonseca	2df7214324	Merge pull request 'Se definen los iconos de las tarjetas en summary y se organiza cabeceras de tablas' (#54) from features/ms_93_leftmenu_icons into dev ... Reviewed-on: hyervoni/salix-front-mindshore#54	2024-01-03 19:55:20 +00:00
carlosfonseca	ead8bb4992	Se definen los iconos de las tarjetas en summary y se organiza cabeceras de tablas	2024-01-03 14:53:01 -05:00
William Buezas	142bac7a43	agregar data por default en tabla extended list	2024-01-03 13:49:08 -03:00
Kevin Martinez	467f32d9e0	Merge remote-tracking branch 'origin/branch-PR-2' into branch-PR-2	2024-01-03 10:50:42 -04:00
Kevin Martinez	2af176a502	Fix catalog filter	2024-01-03 10:50:26 -04:00
Kevin Martinez	54d77c9851	Fix Icon sizing	2024-01-03 10:02:14 -04:00
William Buezas	a66b88ba8e	add delete department popup translation	2024-01-03 10:59:11 -03:00
William Buezas	24fdc1ff97	wip	2024-01-03 10:56:13 -03:00
Alex Moreno	b62a317a66	refs #6595 fix: customerExtendedListFilter	2024-01-03 14:17:09 +01:00
Alex Moreno	5994b4e08e	Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-branch-PR-2	2024-01-03 14:16:26 +01:00
Carlos Satorres	9cd20439a6	refs #6618 fix name	2024-01-03 14:09:29 +01:00
Carlos Satorres	9a9bb2fa44	refs #6618 invoiceOut fix	2024-01-03 13:24:49 +01:00
Carlos Satorres	3c98d099b3	refs #6618 component Cards	2024-01-03 13:00:45 +01:00
Carlos Satorres	92127b766b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6618-vnSubToolBar	2024-01-03 13:00:25 +01:00
Kevin Martinez	134f1e0195	Merge pull request 'Create order lines' (#46) from feature/order into dev ... Reviewed-on: hyervoni/salix-front-mindshore#46	2024-01-03 10:52:20 +00:00
Kevin Martinez	733baa1310	Merge branch 'dev' into feature/order ... # Conflicts: # src/i18n/en/index.js	2024-01-03 06:51:38 -04:00
Javier Segarra	8bde0073f0	Merge pull request '#6098 - Show Toast when copy token' (!141) from 6098_lilium_token_copy into dev ... Reviewed-on: #141 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-01-03 10:44:26 +00:00
Carlos Satorres	6b23c988b3	refs #6618 component vnSubToolBar	2024-01-03 11:06:03 +01:00
Carlos Satorres	3acc4b0d58	vn qtoolbar	2024-01-03 09:59:27 +01:00
Javier Segarra	6a6e38bb60	Merge branch '6098_lilium_token_copy' of https://gitea.verdnatura.es/verdnatura/salix-front into 6098_lilium_token_copy	2024-01-03 09:39:31 +01:00
Javier Segarra	c4cf9842cb	refs #6098 perf: add vite-ignore	2024-01-03 09:39:28 +01:00
Javier Segarra	e05a49e7b7	Merge branch 'dev' into 6098_lilium_token_copy	2024-01-03 08:22:20 +00:00
Javier Segarra	b00b2941c7	refs #6098 perf: define locale equivalences in i18n folder	2024-01-03 09:18:35 +01:00
Carlos Satorres	013a00d653	Merge pull request 'refs #6256 lv breakword' (!104) from 6256-breakWord into dev ... Reviewed-on: #104 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-01-03 08:18:14 +00:00
Javier Segarra	899ccc097a	refs #6098 perf: remove import.meta.glob	2024-01-03 09:18:13 +01:00
Javier Segarra	ac660fadd7	refs #6098 feat: add translate for copyToken	2024-01-03 09:17:28 +01:00
Carlos Satorres	be02a1f47a	Merge branch 'dev' into 6256-breakWord	2024-01-03 08:16:56 +00:00
Jorge Penadés	e711040876	Merge pull request 'refactor: refs #5835' (!129) from 5835-fixListAndSummary into dev ... Reviewed-on: #129 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-01-03 08:04:37 +00:00
Alex Moreno	09cd5464fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-01-03 09:00:42 +01:00
Alex Moreno	0a44c43715	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-01-03 09:00:39 +01:00