1510 Commits

Author	SHA1	Message	Date
Alexandre Riera	37a5e6e6c6	Merge branch 'dev' into 5507-loadConfigAtStart	2023-05-25 10:34:03 +02:00
Vicent Llopis	886c4a15b5	refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía	2023-05-25 10:19:00 +02:00
Vicent Llopis	6010bc1253	refs #5554 movido codigo al vnLayout y parar el evento periódico	2023-05-25 09:51:56 +02:00
Vicent Llopis	fdd22ca2d8	refs #5554 codigo eliminado de vnLayout	2023-05-25 07:32:30 +02:00
Vicent Llopis	2e69e4eea7	a	2023-05-24 15:16:10 +02:00
Vicent Llopis	eab329b230	refs #554 feat: actualizar el token automáticamente	2023-05-24 15:01:59 +02:00
Vicent Llopis	68c33efd9a	refs #5609 fix: front test	2023-05-24 07:33:01 +02:00
Vicent Llopis	0ab411ddc4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter	2023-05-23 13:45:03 +02:00
Juan Ferrer	e08f848812	refs #5667 Model id html fix	2023-05-21 14:35:50 +02:00
Juan Ferrer	a4beb84e66	refs #5667 Translations fixes	2023-05-20 16:49:34 +02:00
Juan Ferrer	08e0bf7ddd	refs #5667 Color fixes	2023-05-20 14:16:24 +02:00
Juan Ferrer	35331e355f	refs #5667 Fixes: Colors, translation	2023-05-20 14:09:11 +02:00
Juan Ferrer	1160cbc279	refs #5667 Fixes: Style, translations, icons	2023-05-20 13:50:55 +02:00
Alex Moreno	c6c15d7c69	refs #5472 feat: changePassword with passExpired	2023-05-19 14:44:19 +02:00
Juan Ferrer	718002d5aa	refs #5667 Style fixes	2023-05-19 14:38:45 +02:00
Juan Ferrer	c1e222db83	refs #5667 Style fixes	2023-05-19 14:31:16 +02:00
Juan Ferrer	20b3c4f5b8	refs #5667 Style improved	2023-05-19 13:51:20 +02:00
Juan Ferrer	a190f2152b	refs #5667 Fixes: Translations, help	2023-05-19 11:14:29 +02:00
Juan Ferrer	29610e52cc	refs #5667 No detail label fix	2023-05-19 11:01:34 +02:00
Juan Ferrer	6b0fd99eb8	refs #5667 Fixes: Style, translations, fixtures, UI	2023-05-19 10:56:15 +02:00
Vicent Llopis	2402b27632	Merge branch 'dev' into 5600-workerPhoto_incorrectSize	2023-05-19 05:55:40 +00:00
Alex Moreno	bbc34f04ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-19 07:35:23 +02:00
Vicent Llopis	d389860704	refs #5609 eliminadas peticiones duplicadas	2023-05-18 14:11:18 +02:00
Juan Ferrer	e8e04423f0	refs #5667 Atrs ordered by name	2023-05-17 16:43:48 +02:00
Juan Ferrer	e7f9984b4b	refs #5667 Fix decimal places	2023-05-17 13:02:51 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Juan Ferrer	dd9699e120	refs #5667 Translation fix	2023-05-16 20:54:13 +02:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Alex Moreno	504791fd6d	typo	2023-05-16 08:48:25 +02:00
Alex Moreno	a1a3f910d3	hotFix(reset-passowrd): use model vnUser	2023-05-16 08:46:16 +02:00
Vicent Llopis	6300ee4be4	refs #5600 foto de los trabajadores cuadrada	2023-05-15 14:24:31 +02:00
Juan Ferrer	4abc8521d3	refs #5517 Style fixes	2023-05-12 11:25:16 +02:00
Juan Ferrer	f6e1ffa849	refs #5517 Log loader fix	2023-05-12 09:48:22 +02:00
Juan Ferrer	d0c8be5697	refs #5517, #5667 Fix crudModel status, log fixes	2023-05-11 12:07:14 +02:00
Juan Ferrer	df1803a2e3	refs #5517 Front test fix	2023-05-10 10:11:52 +02:00
Alex Moreno	8ae67799a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-05-09 07:11:09 +02:00
Juan Ferrer	7a668adf18	refs #5517 pagination fixes	2023-05-08 16:50:20 +02:00
Juan Ferrer	35a888a968	refs #5517 Pagination spinner fixes	2023-05-08 16:48:05 +02:00
Juan Ferrer	a2e71b57a2	refs #5517 Front test fix	2023-05-08 16:33:35 +02:00
Juan Ferrer	2aaded4ed4	refs #5517 Fix: Show spinner when loading	2023-05-08 16:30:21 +02:00
Juan Ferrer	9f02fc66c8	refs #5517 Show spinner when loading	2023-05-08 13:10:51 +02:00
Juan Ferrer	68b1b6c5bd	refs #5517 E2E fixes	2023-05-08 12:03:27 +02:00
Alex Moreno	73fb940c63	refs #5472 try change-password	2023-05-08 10:55:16 +02:00
Alex Moreno	728ef965c4	refs #5472 feat(out_login): change-password	2023-05-05 14:50:20 +02:00
Juan Ferrer	a48e197e46	refs #5517 E2E fixes	2023-05-05 08:12:38 +02:00
Alex Moreno	2da4289695	refs #5472 feat(vn-user): override change-password & set-password	2023-05-04 15:01:29 +02:00
Alex Moreno	a22a8a6bd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-04 11:34:19 +02:00
Alex Moreno	5eca583c62	refs #5472 feat(vnUser): override setPassword	2023-05-03 15:19:19 +02:00
Juan Ferrer	bbd2137e57	refs #5517 Avatar componetized	2023-05-03 11:57:13 +02:00
Alex Moreno	bf3aac70f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-03 11:37:07 +02:00
Juan Ferrer	a029071c4e	refs #5517 User image fixes	2023-05-02 20:47:56 +02:00
Juan Ferrer	a5c11a0154	refs #5517 Hide worker image on error	2023-05-02 17:17:16 +02:00
Alex Moreno	79e7e7c604	refs #5472 feat: add change-password section	2023-05-02 15:16:13 +02:00
Alex Moreno	48be8b9fe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-02 11:27:14 +02:00
Juan Ferrer	eb2c2b386a	refs #5517 Duplicated pagination removed	2023-04-28 19:48:36 +02:00
Juan Ferrer	e70b0b22f3	refs #5517 Code clean	2023-04-28 11:43:45 +02:00
Juan Ferrer	4982fb254c	refs #5517 Final style fixes, production ready	2023-04-28 11:27:02 +02:00
Juan Ferrer	6e3e2cf798	refs #5517 Filter RC	2023-04-27 18:13:17 +02:00
Alex Moreno	42fc0b62d8	refs #5472 feat(user): add passExpired	2023-04-27 15:18:27 +02:00
Juan Ferrer	49368a837b	refs #5517 Filter improved	2023-04-24 19:10:04 +02:00
Alex Moreno	7a79dfd4d1	deploy: 231401 test to dev	2023-04-21 12:49:03 +02:00
Juan Ferrer	9694a35343	refs #5517 Added: Tests, filter panel, model and props titles	2023-04-20 19:46:57 +02:00
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +02:00
Juan Ferrer	61d41fb687	refs #5507	2023-04-19 08:54:58 +02:00
Joan Sanchez	c3443ecc7c	Updated e2e	2023-04-18 14:37:20 +02:00
Joan Sanchez	d5ea45e36f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-18 13:14:57 +02:00
Joan Sanchez	cdf092a989	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-04-18 11:52:17 +02:00
Joan Sanchez	ef87dcc0f5	require authentication on every login	2023-04-18 07:38:40 +02:00
Joan Sanchez	3ee29553b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-17 09:00:52 +02:00
Joan Sanchez	35f94c58b7	reafactor(image): upload image using gm library	2023-04-14 13:04:40 +02:00
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
Joan Sanchez	b9e48f2102	Added translations & enable through departments	2023-04-11 07:39:43 +02:00
Juan Ferrer	d7d4b9515e	refs #5517 json value and date format fixes	2023-04-06 17:02:45 +02:00
Joan Sanchez	2e0325e567	Validate code	2023-04-06 14:59:25 +02:00
Juan Ferrer	f7191f0f7f	refs #5517 log relativeDate function fixes	2023-04-06 08:37:26 +02:00
Joan Sanchez	902709d61b	Added authCode table	2023-04-05 15:22:09 +02:00
Juan Ferrer	3cc6191696	refs #5517 Show abr month name in relative date	2023-04-04 19:01:19 +02:00
Joan Sanchez	0d6b248f76	feat(2fa): email 2fa ... Refs #5475	2023-04-04 14:59:33 +02:00
Juan Ferrer	ae22c58ecb	refs #5517 JSON value component code clean, max str len increased	2023-04-03 18:48:40 +02:00
Juan Ferrer	7f18366ece	refs #5517 Relative dates, style fixes	2023-04-03 18:40:50 +02:00
Juan Ferrer	12074bd0f4	refs #5517 vnLog: watchers fixes	2023-04-03 04:13:09 +02:00
Juan Ferrer	5b80951e3e	refs #5517 vnLog: View improved	2023-04-03 03:54:35 +02:00
Joan Sanchez	8b4c70e8ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-30 14:57:00 +02:00
Alexandre Riera	c6fc2dee24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral	2023-03-23 10:53:11 +01:00
Carlos Satorres	f5109724bf	refs #5073 adaptacion para solo el año	2023-03-17 11:39:16 +01:00
Vicent Llopis	c51e542235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-14 13:43:59 +01:00
Vicent Llopis	2be7320d89	refs #4856 fix: backTest	2023-03-14 07:45:22 +01:00
Vicent Llopis	4dc9e9e590	refs #4856 refactor: make agnostic the component calendar	2023-03-14 07:44:39 +01:00
Vicent Llopis	165dc73b33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-08 12:22:29 +01:00
Vicent Llopis	07edacd557	fix: frontTest	2023-03-08 12:22:14 +01:00
Vicent Llopis	0396d3707c	refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front	2023-03-08 11:47:10 +01:00
Joan Sanchez	56d3b32af5	Merge branch 'dev' into 5090-renameGoLabel	2023-03-08 09:12:53 +00:00
Vicent Llopis	a68fef8a5b	feat: test front	2023-03-08 09:51:09 +01:00
Joan Sanchez	14a5c78303	Updated unit test	2023-03-07 08:13:07 +01:00
Joan Sanchez	c0ff6bea57	fix(smartTable): fixed filtering with an intermediate check ... Refs: #5177	2023-03-07 07:47:30 +01:00
Vicent Llopis	a98bb59479	fix: test front	2023-03-06 12:47:49 +01:00
Vicent Llopis	9e9807c4b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-06 11:55:30 +01:00
Joan Sanchez	37043beb68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-03 07:44:31 +01:00
Vicent Llopis	7c24b940b3	feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes	2023-03-02 14:55:18 +01:00
Alexandre Riera	dbe42e3bf4	refs #5206 version with plane added, needs to implement general search	2023-03-02 13:55:47 +01:00
Carlos Satorres	79d15d930e	Updated package-lock	2023-03-02 11:50:36 +01:00
Carlos Satorres	a1d4dff7d8	Merge branch '5090-renameGoLabel' of https://gitea.verdnatura.es/verdnatura/salix into 5090-renameGoLabel	2023-03-02 11:48:50 +01:00
Carlos Satorres	6509a79b02	Deleted package-lock	2023-03-02 11:48:45 +01:00
Carlos Satorres	ea9a15ece1	Merge branch 'dev' into 5090-renameGoLabel	2023-03-02 10:44:24 +00:00
Alexandre Riera	be1993cf8b	refs #5206 version with top-searcher and two fields for reference and id	2023-03-02 11:33:55 +01:00
Joan Sanchez	57e36cebde	fix(field): prevent input size changes when showing clear icon ... Refs: #5338	2023-03-02 09:44:45 +01:00
Vicent Llopis	bc542d8a40	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-03-01 14:11:12 +01:00
Carlos Satorres	1c3aa29642	refs #5090 model.ezp nuevo	2023-03-01 11:56:41 +01:00
Vicent Llopis	8a1a7d7159	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking	2023-03-01 08:20:28 +01:00
Alexandre Riera	94901d5b1f	refs #5287 pda section added, tests added	2023-02-28 07:49:34 +01:00
Vicent Llopis	c8c48ea175	feat: colorar numeros de semanas segun el registro de horas	2023-02-21 15:16:28 +01:00
Vicent Llopis	1c1e4cc176	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control	2023-02-21 13:37:53 +01:00
Vicent Llopis	432c8a9ab8	refactor: cambiados estilos de los chips	2023-02-21 10:56:46 +01:00
Joan Sanchez	c5c76984ff	Merge pull request 'fix(image): store images with a name generated through uuid instead of url path' (!1337) from 5266-image_fixes into dev ... Reviewed-on: #1337 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-02-21 08:56:19 +00:00
Joan Sanchez	90e1136ee2	fix(image): store images with a name generated through uuid instead of url path ... Refs: #5266	2023-02-20 12:40:13 +01:00
Alexandre Riera	b926666b25	refs #5220 fonts updated	2023-02-20 09:38:24 +01:00
Joan Sanchez	527caf9ca0	refactor(zerofill): deprecated zerofill and removed function ... Refs: #5207	2023-02-17 11:19:35 +01:00
Alex Moreno	65df9b87e7	fix: conflicts	2023-02-13 13:22:53 +01:00
Joan Sanchez	ebee9144b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-09 09:16:30 +01:00
Vicent Llopis	be539a54ce	delete console.log	2023-02-08 09:31:03 +01:00
Vicent Llopis	cda7a6e3fd	fix: no mostraba los numeros de la semana al inicio	2023-02-07 15:01:33 +01:00
Alex Moreno	575784c870	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-03 10:03:59 +01:00
Alex Moreno	e16c16c194	Merge branch 'dev' into 5170-recover-password_use_user	2023-02-03 08:12:54 +00:00
Alex Moreno	6c772643a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-02 11:55:11 +01:00
Vicent Llopis	15429293dd	fix: frontTest	2023-02-02 11:34:13 +01:00
Vicent Llopis	76865fc7b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5084-monitor.index_tickets	2023-02-02 09:18:37 +01:00
Joan Sanchez	4477486f8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-02 08:58:44 +01:00
Joan Sanchez	7a700de5c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-02-02 08:23:17 +01:00
Alex Moreno	4a587049fc	feat(recover-password): use user ... refs #5170	2023-02-01 15:13:38 +01:00
Alexandre Riera	2ef7b0d756	refs #5157 clip-path deleted	2023-02-01 08:48:33 +01:00
Alex Moreno	2528b2d3ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-01 07:10:51 +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
Alex Moreno	4e65e88621	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 07:56:12 +01:00
Alex Moreno	788ebd4133	refactor(recover-password): recovery password label	2023-01-30 07:50:37 +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
Vicent Llopis	51400b1c74	reactor: eliminado try y catch, y añadido finally	2023-01-26 08:19:52 +01:00
Alex Moreno	eb59efbb85	refactor(front): use vn-loopback/boot/date	2023-01-24 15:12:16 +01:00
Vicent Llopis	5a70fd4779	fix: las peticiones no colisionan	2023-01-24 14:45:35 +01:00
Alexandre Riera	1e89352446	hotfix instanceLog css	2023-01-24 14:37:08 +01:00
Joan Sanchez	ee1ce21bb9	refactor(account): account model refactor	2023-01-23 15:24:00 +01:00
Alex Moreno	4a06b8e8a9	fix: import date.js and fix e2e	2023-01-23 15:16:42 +01:00
Vicent Llopis	9eb65507b5	fix: elimino this.model.refresh que siempre daba fallo	2023-01-23 14:43:31 +01:00
Alex Moreno	fe656aa125	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 14:10:20 +01:00
Vicent Llopis	5a19e5801f	fix: enabled button when an error occurs	2023-01-23 11:50:54 +01:00
Alex Moreno	6b6f27c2f2	fix: typo	2023-01-23 08:44:58 +01:00
Alex Moreno	bd0f4d89f8	Merge branch '5043-mock_Date' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:45 +01:00
Alex Moreno	8a844917ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:14 +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
Alex Moreno	8d33aa8454	fix(fixtures): use static dates	2023-01-17 15:36:39 +01:00
Alexandre Riera	fea76f29e7	Merge branch 'dev' into 4866-detalle-faltas	2023-01-17 07:31:45 +00:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alex Moreno	6b1a6fe44b	feat: mock dates front and back	2023-01-16 15:18:00 +01: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
Joan Sanchez	c063c0e72f	fix(pagination): duplicated rows on paginate ... Refs: #4531	2022-12-20 09:48:41 +01:00
Pau	5a01e49f27	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-19 12:25:58 +00:00
Alexandre Riera	98c9e0ac50	refs #4962 autoload added and second header	2022-12-16 13:42:23 +01:00
Alex Moreno	19cbd5b57b	fix css	2022-12-16 08:43:34 +01:00
Alex Moreno	ed68637059	disable outLayout	2022-12-15 15:05:17 +01:00
Alexandre Riera	92a961ecc9	refs #3302 refactor	2022-12-15 14:24:57 +01:00
Alex Moreno	8d7757ddbe	add reset-password	2022-12-15 07:40:51 +01:00
Joan Sanchez	11db08b32b	Updated unit test	2022-12-14 14:20:41 +01:00
Joan Sanchez	a86636bee4	Use proper module codes	2022-12-14 13:49:49 +01:00
Alexandre Riera	4bafcc905a	refs #4866 fix css	2022-12-09 11:41:08 +01:00
Alexandre Riera	704cb71b61	refs #4866 instance log added and e2e done	2022-12-07 13:53:59 +01:00
Alexandre Riera	569a0e8cc9	refs #3302 log modified and fixed e2e tests	2022-12-05 15:30:41 +01:00
Alexandre Riera	36a78fac7f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-05 08:06:25 +01:00
Pau	9ed9c1a82c	Delete sendsms from core/components	2022-11-30 13:13:06 +01:00
Pau	a676351e5b	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-30 07:24:26 +01:00
Joan Sanchez	990dd88e2c	Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev ... Reviewed-on: #1186	2022-11-29 13:08:38 +00:00
Vicent Llopis	a0f5cf1449	refactor: borrados saltos de linea	2022-11-28 14:48:37 +01:00
Vicent Llopis	c3d06ca5db	fix: crashea cuando el log no tiene changedModel	2022-11-28 14:47:23 +01:00
Alex Moreno	d9e4ff6772	fix: use $location	2022-11-28 11:48:25 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Pau	8f98082910	refs #4791 @2h	2022-11-25 09:59:02 +01:00
Pau	1c9964b902	Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms	2022-11-25 08:23:59 +01:00
Pau	d47e7ffb16	change component location	2022-11-25 08:23:57 +01:00
Pau	7c71e40cc5	Merge branch 'dev' into 4791-refactor-sendsms	2022-11-24 13:15:54 +00:00
Vicent Llopis	20d0d053ac	Merge branch 'dev' into 4682-searchbar_filter	2022-11-24 11:03:23 +00:00
Vicent Llopis	74e8789439	Merge branch 'dev' into 4793-models_translation	2022-11-24 10:54:40 +00:00
Vicent Llopis	7ccf37c079	Merge branch 'dev' into 4793-models_translation	2022-11-24 08:08:56 +00:00
Alex Moreno	30a25664de	out-layout component	2022-11-23 13:49:50 +01:00
Vicent Llopis	9a47b2fea4	Merge branch 'dev' into 4682-searchbar_filter	2022-11-23 10:00:27 +00:00
Pau	a8520f851c	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:28:07 +00:00
Alex Moreno	314e98b838	fix: nested router	2022-11-22 14:57:52 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Vicent Llopis	89141419c1	fix: merge filter	2022-11-22 10:36:40 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Vicent Llopis	cac8879ec7	fix: solo vuelve a buscar el mismo filtro en caso de que se encuentre en un index	2022-11-22 09:22:06 +01:00
Pau	4bd643143b	requested changes refs #4791 @1h	2022-11-22 07:59:18 +01:00
Pau	4e97d931f7	refs #4791 @2h	2022-11-21 08:45:45 +01:00
Vicent Llopis	d4712e27c3	fix: no repite la llamada filter cada vez q cambias de seccion	2022-11-17 11:31:36 +01:00
Alex Moreno	9405333c07	try	2022-11-16 15:29:02 +01:00
Pau	5b4c1ad4e6	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-16 12:26:59 +01:00
Vicent Llopis	3d352fa0fd	fix: locale no puede ser undefined	2022-11-16 12:06:50 +01:00
Alex Moreno	9085e7fab1	fix: use routes	2022-11-15 15:12:15 +01:00
Alex Moreno	8dcd567a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-15 13:20:52 +01:00
Vicent Llopis	843e5ae736	feat: traducciones en los modelos	2022-11-15 11:41:57 +01:00
Pau	9d0cd36afe	Merge branch 'dev' into 4457'	2022-11-15 08:49:21 +01:00
Alexandre Riera	7dd87b1ea8	refs #4700 icons future	2022-11-14 09:56:23 +01:00
Juan Ferrer	e7f26e8502	Merge branch 'master' into test	2022-11-11 00:56:20 +01:00
Juan Ferrer	c2b4187b97	refs #4609	2022-11-10 23:46:03 +01:00
Alex Moreno	4c216c4556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-10 14:40:55 +01:00
Alex Moreno	517422be8c	refactor: not use axios	2022-11-10 13:32:07 +01:00
Pau	a237375db6	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-10 10:42:53 +01:00
Alexandre Riera	897a7d079d	Merge branch 'dev' into 2596-arrastrar-ficheros	2022-11-10 07:40:10 +00:00
Alex Moreno	5339bc1143	feat(recoverPassword): use loopback	2022-11-09 14:51:30 +01:00
Juan Ferrer	993ae11277	refs #3302	2022-11-09 09:19:56 +01:00