1164 Commits

Author	SHA1	Message	Date
Joan Sanchez	7a700de5c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-02-02 08:23:17 +01:00
Joan Sanchez	e34d64361b	Account refactor	2023-01-31 14:57:24 +01:00
Pau	136ad332b9	Merge branch 'dev' into 5148-logs-style	2023-01-31 10:36:17 +00:00
Alex Moreno	4740cdbbb9	fix: e2e	2023-01-31 10:37:18 +01:00
Pau	8580851b5b	refs #5148 @0:30h change style to pre-line	2023-01-30 13:32:09 +01:00
Joan Sanchez	9bf4cd5cff	Merge branch 'dev' into 4480-vnUser	2023-01-27 08:20:32 +00:00
Vicent Llopis	67a64582e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-27 08:21:30 +01:00
Joan Sanchez	ee1ce21bb9	refactor(account): account model refactor	2023-01-23 15:24:00 +01:00
Alex Moreno	a674169ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-20 08:30:30 +01:00
Vicent Llopis	ef7a0508ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-20 08:29:42 +01:00
Alexandre Riera	fea76f29e7	Merge branch 'dev' into 4866-detalle-faltas	2023-01-17 07:31:45 +00:00
Alex Moreno	2cc89d9ae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-13 13:54:16 +01:00
Joan Sanchez	c489c4c6a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-13 08:55:01 +01:00
Pau	b6de50848a	refs #5081 fix sms faltas	2023-01-12 11:48:44 +01:00
Vicent Llopis	2451d00998	Merge branch 'dev' into 4925-item.tags	2023-01-12 07:59:43 +00:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Alexandre Riera	9f1c6e6d1d	Merge branch 'dev' into 4866-detalle-faltas	2023-01-10 10:48:10 +00:00
Vicent Llopis	eb3ed95b22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-10 08:32:44 +01:00
Alex Moreno	8688fc4652	Merge branch 'dev' into 4658-createWorker	2023-01-09 06:23:21 +00:00
Robert Ferrús	bcefea726c	Merge branch 'dev' into 4857-invoiceOutTranslate	2023-01-05 13:54:01 +00:00
Robert Ferrús	6891da4863	refactor(invoiceOut): updated translation ... Refs #4857	2023-01-05 11:43:08 +01:00
Vicent Llopis	3edc0403ba	fix	2023-01-05 10:35:42 +01:00
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
Alexandre Riera	ac56744244	Merge branch 'dev' into 4866-detalle-faltas	2023-01-03 12:15:26 +00:00
Vicent Llopis	fa58ac2462	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-03 09:13:47 +01:00
Joan Sanchez	674fe49058	fix(icons): prevent icon translation when using google translator ... Refs: 5044	2023-01-03 08:41:58 +01:00
Alex Moreno	aa5cfde1ae	test(worker_new): add back tests	2023-01-02 14:52:03 +01:00
Vicent Llopis	3792a80ad5	refs #4925 feat: añadido back para editar tags	2022-12-29 14:24:32 +01:00
Alex Moreno	90acbac2ad	refactor(login): split in differents folder	2022-12-28 14:06:51 +01:00
Alex Moreno	990bcc0f6e	feat(app): only use ui-view for routing	2022-12-28 11:18:53 +01:00
Alexandre Riera	762e39f7be	refs #4866 refactor component instance-log	2022-12-23 15:10:35 +01:00
Vicent Llopis	682b6d8961	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-23 09:59:21 +01:00
Alexandre Riera	aec22fad9d	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-23 08:16:36 +01: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	606bacbad7	Merge branch 'dev' into 4531-monitor_duplicates	2022-12-22 10:37:48 +00:00
Pau	aa716634db	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-12-22 08:30:36 +01:00
Vicent Llopis	8880a83b89	feat: añadido saleTracking	2022-12-21 15:03:41 +01:00
Alex Moreno	27288d011d	fix(searchBar): applyParams	2022-12-21 15:01:05 +01:00
Pau	c9b4e1ab9a	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-21 06:38:20 +00:00
Alexandre Riera	c3508c50d4	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 15:29:44 +01:00
Alexandre Riera	c99bfef917	refs #3302 fixed scss	2022-12-20 15:29:21 +01:00
Alexandre Riera	1982e4c989	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 14:25:38 +01:00
Alexandre Riera	27e0c2d0be	refs #3302 where with changedModel and changedModelId	2022-12-20 14:23:47 +01:00
Alexandre Riera	62152d1668	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 12:16:40 +01:00
Alexandre Riera	5b87514501	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-20 12:15:50 +01:00
Pau	1305513b07	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-20 11:01:38 +00:00
Alexandre Riera	8403af7db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-20 11:37:40 +01:00
Joan Sanchez	73ea928b33	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-20 10:40:23 +01:00