13850 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	9ae7b92bbf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-05 09:00:37 +01:00
Joan Sanchez	8f118748b6	Merge pull request 'fix(icons): prevent icon translation when using google translator' (!1237) from 5044-notranslate_icons into dev ... Reviewed-on: #1237 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-01-05 07:29:52 +00:00
Vicent Llopis	21a62a0fab	refactor	2023-01-03 13:29:44 +01:00
Vicent Llopis	fec965a8dd	refs 4925 refactor: borrados console.log y actualizada descripción	2023-01-03 13:29:27 +01:00
Joan Sanchez	731e32c972	Merge branch 'dev' into 5044-notranslate_icons	2023-01-03 12:28:35 +00:00
Vicent Llopis	22d0da273e	refs #4925 fix: coge únicamente los últimos cambios aplicados	2023-01-03 13:21:51 +01:00
Vicent Llopis	ddfee57470	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-03 13:09:02 +01:00
Alexandre Riera	949c73a465	Merge pull request 'fixes #5051 Arreglar tests de back y e2e con fallo por cambio de fecha' (!1235) from 5051-fixBackE2E-dateChange into dev ... Reviewed-on: #1235 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-03 11:26:42 +00:00
Alexandre Riera	6185b2f055	refs #5051 changed fixture	2023-01-03 12:04:38 +01:00
Alexandre Riera	c6083ebe61	refs #5051 fdescribe	2023-01-03 11:53:47 +01:00
Alexandre Riera	b5ef090080	refs #5051 json date	2023-01-03 11:39:50 +01:00
Alexandre Riera	5c2e85d499	refs #5051 consolelog date	2023-01-03 11:00:01 +01:00
Alexandre Riera	04d3d13e82	refs #5051 sub stmt	2023-01-03 10:36:31 +01:00
Alexandre Riera	0ae76746ae	refs #5051 limit stmt	2023-01-03 10:20:44 +01:00
Alexandre Riera	17a7bfbf3b	refs #5051 continue fixing test jenkins	2023-01-03 10:11:52 +01:00
Alexandre Riera	cef0152ef5	refs #5052 fixing jenkins test	2023-01-03 09:44:27 +01:00
Joan Sanchez	d1150d0965	Updated changelog	2023-01-03 09:01:06 +01:00
Joan Sanchez	674fe49058	fix(icons): prevent icon translation when using google translator ... Refs: 5044	2023-01-03 08:41:58 +01:00
Alexandre Riera	9887f87dd3	refs #5051 pending added	2023-01-03 08:34:46 +01:00
Alexandre Riera	96f2e4b542	refs #5051 skipped tests and changed fixtures	2023-01-02 13:35:33 +01:00
Vicent Llopis	3792a80ad5	refs #4925 feat: añadido back para editar tags	2022-12-29 14:24:32 +01:00
Alex Moreno	a5ab5d613a	Merge pull request 'refactor(login): split in differents folder' (!1234) from 4995-split_folder into dev ... Reviewed-on: #1234 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-28 13:18:22 +00:00
Alex Moreno	90acbac2ad	refactor(login): split in differents folder	2022-12-28 14:06:51 +01:00
Alex Moreno	323776e50c	Merge pull request '#4995 feat(app): only use ui-view for routing' (!1232) from 4995-app_use_ui-view into dev	2022-12-28 12:47:40 +00:00
Alex Moreno	c93c276968	Merge branch '4995-app_use_ui-view' of https://gitea.verdnatura.es/verdnatura/salix into 4995-app_use_ui-view	2022-12-28 11:40:14 +01:00
Alex Moreno	fc72a6e2f5	changelog	2022-12-28 11:40:13 +01:00
Alex Moreno	31ad0555fe	Merge branch 'dev' into 4995-app_use_ui-view	2022-12-28 10:28:21 +00:00
Alex Moreno	f4a60d3b35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4995-app_use_ui-view	2022-12-28 11:27:49 +01:00
Alex Moreno	990bcc0f6e	feat(app): only use ui-view for routing	2022-12-28 11:18:53 +01:00
Alexandre Riera	d1eb3b97ea	Merge pull request 'fixes #4971 Filtrar Artículo en la pantalla de compras' (!1224) from 4971-filtrar-articulo into dev ... Reviewed-on: #1224 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-28 09:22:12 +00:00
Alexandre Riera	b6e17d3489	Merge branch 'dev' into 4971-filtrar-articulo	2022-12-28 09:16:14 +00:00
Alexandre Riera	33fbe8cc7b	Merge pull request 'fixes #4957 saleChecked kkear' (!1231) from 4957-saleChecked-kkear into dev ... Reviewed-on: #1231 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-28 09:06:25 +00:00
Alexandre Riera	c06c3dc6a7	refs #4957 saleChecked deleted	2022-12-27 11:50:58 +01:00
Alexandre Riera	7d1b8c8c56	refs #4971 itemSearchFunc added	2022-12-23 12:11:24 +01:00
Joan Sanchez	c13b49c7cd	Added next version & changelog	2022-12-23 10:07:19 +01:00
Joan Sanchez	39699114e3	Changed version	2022-12-23 10:01:08 +01:00
Joan Sanchez	ff0243db8f	Fixed SQL files	2022-12-23 09:55:15 +01:00
Pau	1978d228ff	Merge pull request 'Closes #288 translation for vn.state using i18n' (!1152) from #288-traducir-state-i18n into dev ... Reviewed-on: #1152 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-23 08:15:36 +00:00
Pau	fc86e913c4	Merge branch 'dev' into #288-traducir-state-i18n	2022-12-23 08:09:38 +00:00
Alexandre Riera	bd6935c28e	Merge pull request 'fixes #3302 log front modificaciones' (!1198) from 3302-logFormat into dev ... Reviewed-on: #1198 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-23 08:03:59 +00:00
Alexandre Riera	c34c239375	refs #3302 corrections	2022-12-23 08:13:08 +01:00
Alexandre Riera	eefc5ab80d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-23 08:01:52 +01:00
Joan Sanchez	e15d724db5	Merge pull request 'closes #3681 move-sign_save-to-salix' (!1151) from 3681-move-sign_save-to-salix into dev ... Reviewed-on: #1151 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-22 12:44:01 +00:00
Joan Sanchez	4ae77d7f51	Merge pull request 'fix(pagination): duplicated rows on paginate' (!1214) from 4531-monitor_duplicates into dev ... Reviewed-on: #1214 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-22 10:45:15 +00:00
Joan Sanchez	7c33cd2691	Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev ... Reviewed-on: #1188 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-22 10:43:20 +00:00
Joan Sanchez	606bacbad7	Merge branch 'dev' into 4531-monitor_duplicates	2022-12-22 10:37:48 +00:00
Guillermo Bonet	6660c568e5	Merge pull request 'refs #4898 Added barcode and changes in structure' (!1220) from 4898-expedition-pallet-label-barcode into dev ... Reviewed-on: #1220 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-22 09:54:06 +00:00
Guillermo Bonet	861cdb2863	Merge branch 'dev' into 4898-expedition-pallet-label-barcode	2022-12-22 09:46:50 +00:00
Pau	6ded11a4c2	requested changes refs #3681 @3h	2022-12-22 10:35:11 +01:00
Vicent Llopis	9e045e15b7	Merge pull request '4794-mdb_block' (!1170) from 4794-mdb_block into dev ... Reviewed-on: #1170 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-12-22 09:19:15 +00:00