1184 Commits

Author	SHA1	Message	Date
Alex Moreno	dd4b62d0a5	description	2023-06-13 12:42:12 +02:00
Alex Moreno	aeb04efe82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-13 11:49:42 +02:00
Alex Moreno	92953b9aa8	refs #5094 test(docuware): adapt tests	2023-06-13 11:37:35 +02:00
Vicent Llopis	61f99744c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-13 07:43:23 +02:00
Vicent Llopis	0aae1732bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-06-13 07:35:29 +02:00
Alex Moreno	a07ca62476	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware	2023-06-13 07:11:39 +02:00
Alex Moreno	d3c4a6ba5c	refs #5094 feat(ticket_index): docuware multiple deliveryNote	2023-06-12 15:20:46 +02:00
Alex Moreno	1c39ad873c	resolve dev conflicts	2023-06-12 11:06:45 +02:00
Alex Moreno	5c1b867d05	WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired	2023-06-12 10:46:21 +02:00
Alex Moreno	051269d646	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-12 09:11:17 +02:00
Vicent Llopis	653c37f048	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-06-08 13:12:59 +02:00
Alex Moreno	e5ababb0a9	Merge branch 'dev' into 5712-workerDms_integrateDocuware	2023-06-07 11:49:40 +00:00
Alex Moreno	edc601fd5d	refs #5489 fix(account/sync), fix(order) catalog-search-panel popover	2023-06-07 13:34:13 +02:00
Vicent Llopis	3fdb546d86	refs #5554 refactor: eliminado vnTokenCreated y añadido a vnToken.created	2023-06-07 10:28:29 +02:00
Alexandre Riera	7121b1e516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-07 08:50:53 +02:00
Alex Moreno	cb50c617ee	refs #5489 deprecate account.user.password	2023-06-06 15:09:01 +02:00
Vicent Llopis	98af8ee10f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-06 12:31:20 +02:00
Alex Moreno	91b0e3013a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-05 08:11:47 +02:00
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Alex Moreno	86cd5f5237	refs #5472 fix sync	2023-06-02 15:07:02 +02:00
Guillermo Bonet	5b0a1d10bb	refs #5684 edi/updateData fix	2023-06-02 07:51:01 +02:00
Alex Moreno	9462ca90a7	refs #5472 refactor setPassword & changePassword, fix sync	2023-06-01 15:29:46 +02:00
Alex Moreno	d134ca45f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-01 14:19:23 +02:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Alex Moreno	f0024346a8	refs #5712 openDocuware	2023-05-31 11:32:37 +02:00
Alex Moreno	c23d8282eb	refs #5712 feat(workerDms): docuware download	2023-05-30 15:34:11 +02:00
Vicent Llopis	46b6625527	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-05-30 12:06:31 +02:00
Vicent Llopis	2b34dd19e8	refs #554 delete: test back que falla	2023-05-30 12:06:15 +02:00
Vicent Llopis	21448a84dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-30 10:16:34 +02:00
Vicent Llopis	7d59c6ec0c	refs #5468 feat: eliminado acl nativo y añadido a salix.ACL	2023-05-30 10:07:17 +02:00
Vicent Llopis	ea1c860a18	refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta	2023-05-30 09:13:47 +02:00
Alex Moreno	b60cd2539a	refs #5712 feat(workerDms): docuware integration	2023-05-29 15:21:37 +02:00
Alex Moreno	c7b8e57d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-26 07:41:48 +02:00
Vicent Llopis	06d1de5a63	refs #5554 feat: add back test	2023-05-25 12:06:40 +02:00
Vicent Llopis	91700e096e	refs #5554 fix: cambiada extensión de archivos de test, y solucionado test	2023-05-25 11:51:27 +02:00
Vicent Llopis	f471d62d41	refs #5554 refactor: 'renewToken' utiliza logout y createAccessToken	2023-05-25 10:09:38 +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
Alex Moreno	37a3275b27	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-05-25 08:56:10 +02:00
Vicent Llopis	834a3aa959	refs #5554 fix: eliminada transacción en el back 'renewToken'	2023-05-24 15:16:04 +02:00
Vicent Llopis	eab329b230	refs #554 feat: actualizar el token automáticamente	2023-05-24 15:01:59 +02:00
Alex Moreno	c35e2e155f	refs #5472 test(changePassword): back	2023-05-23 15:12:28 +02:00
Vicent Llopis	cd244daf84	refs #5468 feat: checkbox 'activo' marcado por defecto	2023-05-23 10:04:31 +02:00
Vicent Llopis	aea39dd0b7	refs #5468 feat: modificalos acl de VnUser	2023-05-23 08:45:03 +02:00
Vicent Llopis	3b7b31deb1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 08:31:52 +02:00
Alex Moreno	6f503e2a81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-23 08:23:16 +02:00
Alex Moreno	6f06bac0c1	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-23 05:55:08 +00:00
Alex Moreno	0045edb698	refs #5094 fix get email	2023-05-23 07:39:43 +02:00
Juan Ferrer	da0aa57539	Merge branch 'test' into dev	2023-05-22 19:06:20 +02:00
Juan Ferrer	26c2ab867d	Merge pull request 'master into test' (!1546) from master into test ... Reviewed-on: #1546	2023-05-22 17:04:32 +00:00
Alex Moreno	3189799b4c	correct type	2023-05-22 14:45:00 +02:00
Alexandre Riera	e589e70e06	Merge branch 'dev' into 5655-afinar-login	2023-05-22 10:31:27 +00:00
Alex Moreno	ddab59a10c	refs #5472 refactor(changePassword): convert in async	2023-05-22 09:17:40 +02:00
Alex Moreno	c6c15d7c69	refs #5472 feat: changePassword with passExpired	2023-05-19 14:44:19 +02: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
Alex Moreno	15a1965a53	refs #5094 add scopes	2023-05-18 14:12:46 +02:00
Alex Moreno	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Alexandre Riera	ccdc43d4a3	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-16 07:22:13 +00:00
Alex Moreno	9f0d5097fe	refs #5160 increase jasmine timeout	2023-05-16 09:14:38 +02:00
Alexandre Riera	2c254cbc08	refs #4797 added fields	2023-05-15 14:34:32 +02:00
Alexandre Riera	d4e2049bc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-15 14:27:49 +02:00
Alex Moreno	248caf8519	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-15 07:20:53 +02:00
Alexandre Riera	b9ec6b93b6	Merge branch 'dev' into 5655-afinar-login	2023-05-12 07:46:10 +00:00
Vicent Llopis	3f26072787	refs #5468 eliminados getters a VnUser	2023-05-12 09:02:55 +02:00
Javi Gallego	8a843b37bd	refs #5160 Back test timeout workaround	2023-05-11 13:54:42 +02:00
Alexandre Riera	7bcb00c127	refs #5655 removed relation	2023-05-11 08:55:11 +02:00
Alexandre Riera	33ef9bdf61	refs #4797 refactor	2023-05-11 07:18:58 +02:00
Alexandre Riera	9cb756544e	refs #4797 added id to notification in activeNotifications	2023-05-10 14:13:38 +02:00
Alexandre Riera	f9e7963e74	refs #4797 minor fixes	2023-05-10 14:10:00 +02:00
Vicent Llopis	62dd64eb89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-10 11:56:50 +02:00
Alexandre Riera	5171e63188	refs #4797 minor fixes	2023-05-09 14:20:20 +02:00
Alexandre Riera	e7d16dc8ba	refs #4797 fix test, add getList	2023-05-09 11:34:32 +02:00
Alexandre Riera	b37bde2ba7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-09 08:14:42 +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
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
Alex Moreno	456e1d5912	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-05 14:11:47 +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
Alexandre Riera	a2d3b79246	Merge branch 'dev' into 4713-saleTracking	2023-05-04 06:42:39 +00:00
Alex Moreno	5eca583c62	refs #5472 feat(vnUser): override setPassword	2023-05-03 15:19:19 +02:00
Alex Moreno	79e7e7c604	refs #5472 feat: add change-password section	2023-05-02 15:16:13 +02:00
Alexandre Riera	13c37e88ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-05-02 11:38:07 +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
Alexandre Riera	70c46efe27	refs #4797 fix back test	2023-05-02 09:51:04 +02:00
Alex Moreno	c3038a4d61	fix(imageCollection):	2023-04-28 11:54:11 +02:00
Alex Moreno	42e3c8f29d	refs #5488 fix(): use hasWriteRole	2023-04-28 09:35:15 +02:00
Alex Moreno	42fc0b62d8	refs #5472 feat(user): add passExpired	2023-04-27 15:18:27 +02:00
Vicent Llopis	87ffd2668e	refs #5468 scope para VnUser	2023-04-27 15:06:05 +02:00
Alexandre Riera	878f232fda	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking	2023-04-26 14:20:23 +02:00
Vicent Llopis	37a7d02006	quitado scope	2023-04-26 12:18:32 +02:00
Vicent Llopis	74d543884e	refs #5468 añadido scope al modelo VnUser	2023-04-26 11:55:01 +02:00
Juan Ferrer	081b4af6d6	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-24 10:44:42 +02:00
Alex Moreno	294bf2b8a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-04-21 13:30:34 +02:00
Alex Moreno	7a79dfd4d1	deploy: 231401 test to dev	2023-04-21 12:49:03 +02:00
Juan Ferrer	6f1744baff	Merge branch 'dev' into 5517-improveLogs+translations	2023-04-20 16:30:24 +02:00
Alex Moreno	c1d4281b1b	refs #5488 replace hasWriteRole, hasReadRole	2023-04-19 13:59:26 +02:00
Joan Sanchez	c3443ecc7c	Updated e2e	2023-04-18 14:37:20 +02:00
Joan Sanchez	c2af40edb5	changes	2023-04-18 13:15:04 +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	32c9e22d96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-04-18 11:41:55 +02:00
Joan Sanchez	ef87dcc0f5	require authentication on every login	2023-04-18 07:38:40 +02:00
Alexandre Riera	7d8a0597c1	Merge branch 'dev' into 5518-log-user-role	2023-04-17 09:53:36 +00:00
Alexandre Riera	2675c02d13	refs #5518 moved models to account	2023-04-17 11:52:52 +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
Juan Ferrer	c5dcfd3cab	refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing	2023-04-15 14:24:50 +02:00
Juan Ferrer	ca3a1be20f	refs #4480 md5 removed from VnUser	2023-04-15 01:52:22 +02:00
Juan Ferrer	2af48b3049	refs #4480 Fix: VnUser before save hook removed -> setting password attribute	2023-04-15 01:51:38 +02:00
Alexandre Riera	ad3836552e	refs #5518 sections added	2023-04-14 14:16:29 +02:00
Joan Sanchez	6e7b452792	Max quality	2023-04-14 13:19:17 +02:00
Joan Sanchez	35f94c58b7	reafactor(image): upload image using gm library	2023-04-14 13:04:40 +02:00
Joan Sanchez	9aaea7e8ed	Changed to new SQL version	2023-04-13 12:01:51 +02:00
Joan Sanchez	b5f2cf3711	Added unit test & translation fixes	2023-04-13 11:54:56 +02:00
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
Joan Sanchez	4807fcb394	Removed focus	2023-04-11 09:01:59 +02:00
Joan Sanchez	b0f1bae33e	Added unit test	2023-04-11 08:56:50 +02:00
Joan Sanchez	087e91e898	Updated unit tests	2023-04-11 08:15:46 +02:00
Joan Sanchez	2e0325e567	Validate code	2023-04-06 14:59:25 +02:00
Joan Sanchez	b49307463e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-04 13:53:25 +02:00
Joan Sanchez	e8f0a49f0c	fix(resetPassword): increased token TTL for password recovery ... Refs #5474	2023-04-04 13:51:44 +02:00
Joan Sanchez	f4ff869c4d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-03 08:55:51 +02:00
Joan Sanchez	02a1bcbfd3	fix(setPassword): proper access type ... Refs #5471	2023-04-03 08:54:15 +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
Joan Sanchez	cc759373a1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-29 15:20:57 +02:00
Vicent Llopis	b0d205c4da	refs #5464 fix: utiliza una sola cookie	2023-03-29 13:36:23 +02:00
Vicent Llopis	dca760d4e4	Merge branch 'dev' into 4858-chat_realTime	2023-03-24 10:02:51 +00:00
Alexandre Riera	4e5364dc0b	refs #5036 fix tests logs	2023-03-23 10:05:02 +01:00
Vicent Llopis	4141a97356	refs #4858 fix: backTest	2023-03-21 11:37:26 +01:00
Vicent Llopis	32e2d1c0fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime	2023-03-21 11:26:41 +01:00
Vicent Llopis	d1f0ae3865	refs #4858 fix: filtro corregido	2023-03-21 11:26:25 +01:00
Alexandre Riera	f037575428	Merge branch 'dev' into 4632-guardarFirmas-salix	2023-03-16 08:06:17 +00:00
Joan Sanchez	6495e016a8	Endpoints refactor	2023-03-14 08:17:46 +01:00
Joan Sanchez	63d7dafcde	feat(print): added reusable pdf print functions ... Refs #5182	2023-03-13 15:05:19 +01:00
Vicent Llopis	c46d325e23	fix: add transaction	2023-03-09 07:58:39 +01:00
Alexandre Riera	423ae85212	refs #4632 dmsRecover deprecated	2023-03-08 12:29:09 +01:00
Alexandre Riera	06dd72f30c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix	2023-03-08 12:13:48 +01:00
Alexandre Riera	106f96b9a6	refs #4713 fixed front test	2023-03-08 12:10:08 +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
Alexandre Riera	8679aefb48	refs #4713 procs deprecated, originalQuantity deleted	2023-03-03 07:36:04 +01:00
Alexandre Riera	5ccfe6bf90	refs #5160 callback added	2023-02-28 11:19:41 +01:00
Alexandre Riera	2a4d41cbca	refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed	2023-02-24 14:41:02 +01:00
Joan Sanchez	0d16f71fd3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-21 14:10:36 +01:00
Joan Sanchez	71167ffa1f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-21 14:02:25 +01:00
Joan Sanchez	49c2ec7f9a	fix(image): Enabled failOn option ... Refs: #5266	2023-02-21 14:01:12 +01:00
Joan Sanchez	0393d9cb6a	Removed commented block code	2023-02-20 14:17:18 +01: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
Alex Moreno	f06fc92ae8	refactor(chat): not use transactions	2023-02-08 15:15:26 +01:00
Vicent Llopis	cec7602e1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-07 13:44:53 +01:00
Alex Moreno	44055775cb	fix: not use variables and direct send in send	2023-02-06 10:11:41 +01:00
Alex Moreno	7ad9e2cb5a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime	2023-02-06 10:05:17 +01:00
Joan Sanchez	d773837740	Removed user model	2023-02-03 14:44:00 +01:00
Vicent Llopis	ba5616055b	feat: item.descriptor en summary coge el warehouse por defecto	2023-02-03 14:31:50 +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
Vicent Llopis	508bce73bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-03 08:41:35 +01: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
Joan Sanchez	eded1ebf20	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-02-02 11:42:48 +01:00
Joan Sanchez	644d98ec1c	syncUser() and setPassword() changes	2023-02-02 07:32:38 +01:00
Alex Moreno	4a587049fc	feat(recover-password): use user ... refs #5170	2023-02-01 15:13:38 +01:00
Joan Sanchez	e34d64361b	Account refactor	2023-01-31 14:57:24 +01:00
Vicent Llopis	caf1dcd690	feat: añadido almacén por defecto	2023-01-25 15:19:33 +01:00
Joan Sanchez	12cf79ab39	Updated e2e	2023-01-25 14:14:55 +01:00
Alex Moreno	d77730dd47	fix: mockedDate in e2e	2023-01-25 10:10:25 +01:00
Joan Sanchez	f0b44a2992	Updated back unit tests	2023-01-24 10:35:21 +01:00
Pau	a2150b8b08	change test to adhere to the fixtures	2023-01-24 10:15:32 +01:00
Pau	c13bffcc57	refs #4797 @1h requested changes	2023-01-24 10:11:16 +01:00
Joan Sanchez	89eb065f6d	Updated models	2023-01-24 09:04:43 +01:00
Pau	dfa3022949	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-24 08:20:45 +01:00
Joan Sanchez	ee1ce21bb9	refactor(account): account model refactor	2023-01-23 15:24:00 +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
Joan Sanchez	781c751229	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-01-20 07:42:36 +01:00
Pau	a425d54bf6	add back test	2023-01-18 12:16:47 +01:00
Pau	10c70f5388	Merge branch '4797-lilium-worker-notifications' of https://gitea.verdnatura.es/verdnatura/salix into 4797-lilium-worker-notifications	2023-01-18 09:06:18 +01:00
Pau	a5f83021db	requested changes	2023-01-18 09:06:17 +01:00
Pau	ec4c628adf	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-18 06:43:45 +00:00
Pau	cc806cc08f	requested changes	2023-01-18 07:41:10 +01:00
Pau	51b2e5a3bc	Merge branch 'dev' into 4732-previa-label	2023-01-17 10:37:07 +01:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Alex Moreno	73c3f05377	refactor(docuware_upload): simplify json	2023-01-16 07:36:06 +01:00
Alex Moreno	9a3fea99ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send	2023-01-13 13:45:10 +01:00
Alex Moreno	def41c011c	feat(docuware_upload): send to trash last file	2023-01-13 13:33:59 +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
Vicent Llopis	1c532d81e8	fix: permite cerrar varios estados	2023-01-13 08:38:03 +01:00
Alex Moreno	5bb66fec3f	test(docuware): back tests	2023-01-12 15:16:38 +01:00
Vicent Llopis	6a8e7873fa	fix: sólo cierra caus que el último mensaje sea una respuesta. Cierra caus con el estado 'Abierto' y 'En espera'º	2023-01-12 15:07:48 +01:00
Joan Sanchez	fe6211e965	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 09:56:59 +01:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Alex Moreno	9f324483d6	refactor(docuware): only use axios and refactor all	2023-01-11 15:19:09 +01:00
Alex Moreno	b8fe919b2a	feat(docuware): upload deliveryNote file	2023-01-10 15:03:23 +01:00
Vicent Llopis	f103931e50	fix: se concatenan pq sino no muestra el id del ticket	2023-01-10 08:14:13 +01:00
Alex Moreno	382aad2622	feat(docuware): upload and send pdf	2023-01-09 15:11:53 +01:00
Vicent Llopis	201987fb99	feat: muestra el error	2023-01-09 11:42:16 +01:00
Pau	3b69d76525	fix error preventing subscriptions	2023-01-09 08:43:11 +01:00
Vicent Llopis	0c6d335c4a	refactor: machacar stack	2023-01-05 15:01:29 +01:00
Vicent Llopis	a68fe26952	refactor: machar stack	2023-01-05 15:01:20 +01:00
Vicent Llopis	f356188491	feat: salta los tickets bloqueados	2023-01-05 14:54:43 +01:00
Vicent Llopis	1a74e84359	feat: salta los tickets bloqueados	2023-01-05 14:32:14 +01:00
Vicent Llopis	8f81aa2eeb	fix: salta los tickets que estan bloqueados	2023-01-05 14:28:35 +01:00
Pau	24b8b172b9	use notification id	2023-01-05 14:13:42 +01:00
Pau	4ae903191a	Merge branch 'dev' into 4732-previa-label	2023-01-05 12:48:03 +00:00
Alex Moreno	46f36e1de1	try	2023-01-04 15:03:45 +01:00
Alex Moreno	d85717ca04	feat: chat in real time	2023-01-04 11:23:06 +01:00
Alex Moreno	8dfc588a7e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime	2023-01-04 09:48:46 +01:00
Pau	1653439c44	Merge branch 'dev' into 4797-lilium-worker-notifications	2023-01-03 12:33:21 +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
Pau	a55d007655	requested changes	2023-01-03 08:12:46 +01:00
Pau	0a602892e6	changed let to const and removed duplicate code	2022-12-27 14:59:23 +01:00
Pau	ee0cd2174f	requested changes refs #4797 @2h	2022-12-27 14:32:19 +01:00
Pau	c9468990b7	Merge branch 'dev' into 4797-lilium-worker-notifications	2022-12-27 10:08:39 +01:00
Pau	7a5993b4fe	Merge branch 'dev' into 4732-previa-label	2022-12-26 07:12:13 +01:00
Pau	a8ca163321	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-12-22 10:49:41 +01:00
Pau	6ded11a4c2	requested changes refs #3681 @3h	2022-12-22 10:35:11 +01:00
Pau	aa716634db	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-12-22 08:30:36 +01:00
Pau	a713cf92cf	Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2022-12-22 08:00:33 +01:00
Pau	f6f6d0866d	requested changes refs #4732 @1h	2022-12-22 08:00:18 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00
Vicent Llopis	2becc0200c	Merge branch 'master' into 4943-master_closeTickets	2022-12-21 10:53:37 +00:00
Pau	1430749892	Merge branch 'dev' into 4732-previa-label	2022-12-21 07:02:02 +00:00
Vicent Llopis	cb9ad5d012	refactor: show ticketId error	2022-12-20 08:45:14 +01:00
Alex Moreno	fb3f3c64c9	refs #4858	2022-12-19 09:59:03 +01:00
Pau	f652e86c78	Merge branch 'dev' into 4732-previa-label	2022-12-19 07:47:08 +01:00
Alexandre Riera	6130547420	Merge branch 'dev' into 4503-opcion-rocket	2022-12-16 12:42:42 +00:00
Joan Sanchez	11db08b32b	Updated unit test	2022-12-14 14:20:41 +01:00
Pau	5235ed5499	Merge branch 'dev' into 4732-previa-label	2022-12-02 08:05:04 +00:00
Vicent Llopis	e7173fe156	fix: backTest	2022-12-01 11:59:30 +01:00
Vicent Llopis	2bb6c1c1da	fix: borra registros aunq no tengan file adjunto	2022-12-01 07:54:32 +01:00
Pau	a676351e5b	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-30 07:24:26 +01:00
Vicent Llopis	2801e11965	Merge branch 'dev' into DEV_fix_deleteTrashFiles	2022-11-29 07:43:50 +00:00
Vicent Llopis	d58e567295	fix: maneja si el dms no tiene file. Simplemente borra el registro	2022-11-28 08:51:04 +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
Joan Sanchez	ca0164ff18	unit test updated	2022-11-25 12:56:25 +01:00
Joan Sanchez	2210f8970c	Fixes	2022-11-25 12:26:58 +01:00
Joan Sanchez	6b94922335	Fixes	2022-11-25 12:12:48 +01:00
Vicent Llopis	bd91d4a649	fix: añadida transacción	2022-11-25 11:50:24 +01:00
Joan Sanchez	6af7da4793	Updated regex	2022-11-25 11:13:26 +01:00
Joan Sanchez	7ea4d9c2e1	fix(rocketchat): Regex fix	2022-11-25 09:18:21 +01:00
Joan Sanchez	db64ba48fc	fix(rocketchat): Removed parenthesis	2022-11-25 08:45:26 +01:00
Joan Sanchez	866ee4d565	fix(rocketchat): Replace invalid link characters	2022-11-25 08:36:29 +01:00
Pau	02f2724f2b	Merge branch 'dev' into 4732-previa-label	2022-11-25 06:35:15 +00:00
Pau	dfdf3d68bf	changes needed for the worker Notification manager to work	2022-11-24 09:36:05 +01:00
Alex Moreno	7651dcb473	feat: resetPasswordRequest use more params	2022-11-23 14:43:18 +01: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
Pau	2567a1fab3	refs #4732 @4h30m	2022-11-21 13:31:55 +01:00
Alex Moreno	f8e6b71bc6	typo	2022-11-18 10:27:05 +01:00
Alex Moreno	77b2f9cbd9	user emailUser	2022-11-18 10:25:25 +01:00
Alex Moreno	d70d848717	fix: use vn email	2022-11-18 09:57:07 +01:00
Pau	25764c0411	change error message	2022-11-16 13:43:48 +01:00
Pau	5b4c1ad4e6	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-16 12:26:59 +01:00
Pau	7038d67d94	Removed comments	2022-11-16 12:04:58 +01:00
Pau	3199797ee0	remove missplaced method	2022-11-16 12:04:19 +01:00
Pau	6ab28678c5	Removed unused require and insert statement	2022-11-16 11:56:03 +01:00
Pau	0f0c4c0554	feat(save-sign implemented in salix back, refs 3681 @2h	2022-11-16 10:28:13 +01:00
Pau	8e7e7901af	Implement needed functions refs #3681 @1h	2022-11-16 08:11:29 +01:00
Alexandre Riera	c5fb565484	refs #4503 message added	2022-11-15 10:25:33 +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
Pau	56201f4c1a	Start implementing method refs #3681 @3h	2022-11-10 13:37:16 +01:00
Alex Moreno	517422be8c	refactor: not use axios	2022-11-10 13:32:07 +01:00
Joan Sanchez	83590b3adf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-10 11:54:05 +01:00
Pau	a237375db6	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-10 10:42:53 +01:00
Alex Moreno	5339bc1143	feat(recoverPassword): use loopback	2022-11-09 14:51:30 +01:00
Vicent Llopis	9890db820b	feat: borra los dms sin file y elimina registros aunq no se pueda eliminar la carpeta	2022-11-08 12:48:09 +01:00
Alex Moreno	fcf46ade7d	feat: reset-password section	2022-11-07 15:15:00 +01:00
Alex Moreno	5c9bc47235	user model	2022-11-03 14:59:12 +01:00
Alex Moreno	9c671ed3a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 13:47:00 +01:00
Joan Sanchez	e2101db706	Merge branch 'dev' into 4155-close_tickets_fix2	2022-11-02 11:53:47 +00:00
Alex Moreno	755a1667dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 07:35:04 +01:00
Joan Sanchez	231575d23e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-31 12:40:07 +01:00
Joan Sanchez	d34936015b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-10-31 12:39:54 +01:00
Vicent Llopis	264b56378a	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-28 06:31:12 +00:00
Alex Moreno	9eb3b09be1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-28 08:26:45 +02:00
Alex Moreno	ad1b429d10	check if user has role from userToUpdate	2022-10-28 08:09:47 +02:00
Alex Moreno	80617dd578	Merge branch 'dev' into 4320-notificationQueue	2022-10-28 05:33:45 +00:00
Alex Moreno	5c65314162	use findById	2022-10-27 09:27:50 +02:00
Alex Moreno	3ffc098b56	feat(privileges): check if user has role from userToUpdate	2022-10-27 09:01:09 +02:00
Pau	c1c06f27d3	create save.js	2022-10-27 08:21:21 +02:00
Alex Moreno	a9a20758bd	remove unnecesary	2022-10-26 13:33:02 +02:00
Alex Moreno	cf24301bfe	feat(account): email-verify refs #4077	2022-10-26 13:28:26 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Vicent Llopis	5e0f976ad2	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-26 06:25:18 +00:00
Alex Moreno	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Alex Moreno	41d2d14d39	try	2022-10-21 13:46:53 +02:00
Alex Moreno	bcfbeb7032	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-21 12:41:39 +02:00
Vicent Llopis	6f7ec12cb2	feat: response as 'reply' and not as 'internNote'	2022-10-19 10:35:41 +02:00
Alex Moreno	0bc018ec02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-17 14:06:31 +02:00
Vicent Llopis	e6481af3a9	delete: transaction	2022-10-17 13:13:14 +02:00
Alex Moreno	c24b975f26	remove node_env	2022-10-17 12:14:11 +02:00
Alex Moreno	aef47d46b1	env test	2022-10-17 12:12:10 +02:00
Alex Moreno	6bfd54fc71	feat(verify): use user.verify	2022-10-17 07:22:22 +02:00
Alex Moreno	3e746ceb7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-14 14:47:42 +02:00
Alex Moreno	c637f2c879	feat(send): use vn-print libary and adapt test	2022-10-14 13:22:53 +02:00
Alex Moreno	de44ce6bd4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue	2022-10-14 12:44:42 +02:00
Alex Moreno	c2d37dadf7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue	2022-10-14 08:01:06 +02:00
Alex Moreno	e240702884	use user	2022-10-13 14:55:34 +02:00
Alex Moreno	acc88c8239	use ejs template	2022-10-11 14:56:33 +02:00
Joan Sanchez	b2e98c9d73	Transaction	2022-10-11 14:39:57 +02:00
Joan Sanchez	d06492d367	Transaction error	2022-10-11 14:28:14 +02:00
Alex Moreno	2e36164a98	fix(recover-password): use pint/Email	2022-10-11 10:06:25 +02:00
Alex Moreno	ce2ad32ac9	add email template	2022-10-10 15:16:56 +02:00
Alex Moreno	5c4daee35e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-10 14:20:22 +02:00
Joan Sanchez	8ccb47d741	Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev ... Reviewed-on: #1073 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-06 11:54:16 +00:00
Joan Sanchez	22187c1450	Enforce npm node version	2022-10-06 11:32:13 +02:00
Joan Sanchez	f2eaa9d0e5	Merge branch 'dev' into 4077-login_recover-password	2022-10-06 06:28:00 +00:00
Joan Sanchez	68d7bc8e20	Test	2022-10-05 14:14:05 +02:00
Joan Sanchez	3d36c0339a	Merge branch 'dev' into 4592-jenkins_tests	2022-10-05 12:05:10 +00:00
Joan Sanchez	076fce058c	Exit on completion	2022-10-05 13:38:17 +02:00
Joan Sanchez	df929c77ce	Test	2022-10-05 13:32:43 +02:00
Joan Sanchez	726b2d5eb2	Exit on completion	2022-10-05 13:26:18 +02:00
Joan Sanchez	6f8e2c8e79	Disabled junit	2022-10-05 13:01:28 +02:00
Joan Sanchez	9644e1e5ec	Removed console.log	2022-10-05 12:37:16 +02:00
Joan Sanchez	f256af3d02	Log host ip	2022-10-04 14:48:28 +02:00
Alex Moreno	7a690dd880	feat(user): add section privileges and remove changeRole in descriptor ... test(user):back and e2e	2022-10-03 15:11:29 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Alex Moreno	81752e7f30	quit userError	2022-09-28 12:20:29 +02:00
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Alex Moreno	dc605387ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-09-26 08:23:10 +02:00
Alex Moreno	fc5460dc9e	feat(account): send verifyEmail when change email and tests	2022-09-26 08:21:58 +02:00
Alex Moreno	c79f884526	feat(recover-password): open changePass in front and tests done	2022-09-22 09:22:24 +02:00
Alex Moreno	00f5689825	feat(account): recover-password	2022-09-21 15:15:19 +02:00
Vicent Llopis	04676d5d98	fix: jump to next iteration if file not found	2022-09-21 08:56:13 +02:00
Joan Sanchez	71f8e73e55	Merge pull request '4155-close_tickets' (#1056) from 4155-close_tickets into dev ... Reviewed-on: #1056 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 06:46:24 +00:00
Alex Moreno	918863ee8e	feat(account): recover-password	2022-09-20 15:21:01 +02:00
Alex Moreno	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Vicent Llopis	6367f1ef05	refator: delete sensitive info	2022-09-16 11:46:55 +02:00
Vicent Llopis	7480bf8a69	feat: do nothing if user and password are empty in osTicketConfig	2022-09-16 10:31:02 +02:00
Vicent Llopis	cfe5c66fe4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets	2022-09-16 09:23:56 +02:00
Vicent Llopis	5fce5b3e4f	refator: delete console.log	2022-09-15 08:38:00 +02:00
Vicent Llopis	28bf7bd747	feat: check general status 'open' to close ticket	2022-09-15 08:34:42 +02:00
Joan Sanchez	5a46444875	Use POST request method instead of GET	2022-09-13 13:53:44 +02:00
Joan Sanchez	fce26342a9	Return inside try-catch	2022-09-08 11:42:16 +02:00
Joan Sanchez	4251b0baeb	Removed debug logs	2022-09-08 11:19:04 +02:00
Joan Sanchez	b499de7c08	tx commit	2022-09-08 10:33:51 +02:00
Joan Sanchez	151e1b52ed	Updated transaction	2022-09-08 09:21:05 +02:00
Joan Sanchez	ab86ba0652	Disabled transaction	2022-09-07 12:28:53 +02:00
Joan Sanchez	aec053868d	Debug logs	2022-09-07 11:50:02 +02:00
Joan Sanchez	48916e2b07	Debug logs	2022-09-07 11:26:58 +02:00
Joan Sanchez	8f86cacc96	Missing await	2022-09-07 10:48:24 +02:00
Joan Sanchez	aba1696ad7	Changes	2022-09-07 10:26:32 +02:00
Joan Sanchez	7264595646	Throw error for max-retries	2022-09-06 14:23:25 +02:00
Joan Sanchez	5c5440cdfc	Removed callback	2022-09-06 13:13:49 +02:00
Joan Sanchez	37f0b557f4	Removed callback	2022-09-06 13:13:29 +02:00
Joan Sanchez	6410a4db42	Send response before ending task execution	2022-09-06 12:54:33 +02:00
Joan Sanchez	011e372558	Removed wrong commit code pick	2022-09-06 12:21:38 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	538c04e8c5	feat: db connection and query	2022-07-29 11:59:03 +02:00
Vicent Llopis	e5349ec7ed	fix: send messages to channels	2022-07-27 09:16:49 +02:00
Joan Sanchez	e916915435	Updated to POST	2022-07-26 12:08:38 +02:00
Joan Sanchez	f4825488c6	refactor(Tasks API): ghanged method to GET	2022-07-26 11:47:43 +02:00
Alex Moreno	2b19688ca4	quit focus	2022-07-25 08:25:46 +02:00
Alex Moreno	8048d4ce90	feat(notification): basic functionality and test	2022-07-25 08:25:10 +02:00
Alex Moreno	f432d64f56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue	2022-07-25 07:45:26 +02:00
Vicent Llopis	5491fce0c6	fix: musn't delete files on test enviroment	2022-07-21 13:16:30 +02:00
Vicent Llopis	eccbd942f7	feat: can close a ticket	2022-07-21 13:11:24 +02:00
Vicent Llopis	0ff3a9d45a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets	2022-07-21 12:23:44 +02:00
Alex Moreno	9b48cbb078	feat(notification): send	2022-07-20 14:54:50 +02:00
Alex Moreno	7895decf4e	feat(notification): create models	2022-07-19 15:17:22 +02:00
Vicent Llopis	1be0e9b7a9	feat: delete dms trash file	2022-07-19 12:40:52 +02:00
Vicent Llopis	5eec01bdc3	feat: close tickets	2022-07-19 11:20:08 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Joan Sanchez	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00
Carlos Jimenez Ruiz	aa6ec3f770	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4185-secure_client_pass_changes	2022-06-16 12:01:05 +02:00
Carlos Jimenez Ruiz	0f44f072ee	refactor(client): added updateUser and setPassword methods to client module	2022-06-16 11:32:42 +02:00
Alex Moreno	8474fb5692	Merge branch 'dev' into 3498-staticDate	2022-06-15 07:15:34 +00:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Juan Ferrer	86605c3d67	Merge branch 'dev' into 4164-edi_updateData	2022-06-09 10:18:03 +00:00
Carlos Jimenez Ruiz	cd5dba6fcb	Merge branch 'dev' into 4040-chat_sendQueued	2022-06-09 08:44:22 +00:00
Joan Sanchez	7fe7fb2e8f	Replaced fs sync functions	2022-06-09 10:13:45 +02:00
Alex Moreno	7eec9de0aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-06-09 07:47:03 +02:00
Vicent Llopis	93bb678738	updated endpoints description	2022-06-08 13:08:53 +02:00
Joan Sanchez	33e9dacf60	Merge branch 'dev' into 4164-edi_updateData	2022-06-07 11:07:19 +00:00
Joan Sanchez	f77f5cee58	4164 - Endpoint refactor	2022-06-07 13:06:42 +02:00
Joan Sanchez	70632ddc7c	Clean	2022-06-04 12:58:58 +02:00
Joan Sanchez	5918ddce3c	Fix table cleaning	2022-06-04 12:45:02 +02:00
Joan Sanchez	0bb142a5d9	Removed rmdir	2022-06-04 12:25:05 +02:00
Joan Sanchez	13e0772f0b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-03 14:28:39 +02:00
Vicent Llopis	e4b23fa14d	fix: bugs	2022-06-03 14:02:23 +02:00
Joan Sanchez	5059f72ea5	Clean directory	2022-06-03 13:54:58 +02:00
Vicent Llopis	e30817644a	fix: bug	2022-06-03 13:48:44 +02:00
Joan Sanchez	bdb581db94	Disable file delete	2022-06-03 13:47:40 +02:00
Vicent Llopis	9f57481390	refator: change comments	2022-06-03 13:44:42 +02:00
Vicent Llopis	fa27e6dd58	fix: backTest	2022-06-03 13:36:21 +02:00
Joan Sanchez	391960b390	Fixed sql table name	2022-06-03 13:27:58 +02:00
Joan Sanchez	3752ca2347	Changed when file is removed	2022-06-03 13:22:32 +02:00
Joan Sanchez	33049c507f	Transaction fix	2022-06-03 13:01:39 +02:00
Joan Sanchez	b790ee88d9	Edi fixes	2022-06-03 12:57:39 +02:00
Joan Sanchez	9bb264da38	Fixes	2022-06-03 12:52:41 +02:00
Joan Sanchez	d0e7ef8f47	Fixed SQL templates	2022-06-03 12:44:39 +02:00
Joan Sanchez	b1ce77d362	Debug logs	2022-06-03 12:35:45 +02:00
Vicent Llopis	3eac002fb4	feat: add queue to send rocket messages	2022-06-03 12:22:07 +02:00
Joan Sanchez	b98ac4f233	Debugging logs	2022-06-03 12:18:06 +02:00
Joan Sanchez	f3eb36f8ee	Edi fixes	2022-06-03 11:47:43 +02:00
Vicent Llopis	f6028316f4	feat: endpoint sendQueued addded	2022-06-02 14:55:39 +02:00
Alex Moreno	9a25bdad06	relaunch tests	2022-06-02 09:01:34 +02:00
Vicent Llopis	7de0fd6634	feat: create table chat	2022-06-01 13:49:45 +02:00
Alex Moreno	316bd56acc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2470-account_e2e	2022-05-25 07:35:59 +02:00
Joan Sanchez	f9b9dfaf4b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-24 14:54:06 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz	c721d9ae82	Merge branch 'dev' into 4022-client.balance.create	2022-05-23 12:43:00 +00:00
Vicent Llopis	a043c5d346	refactor: request changes	2022-05-20 13:10:48 +02:00
Vicent Llopis	c9bfbe990a	refactor: request changues	2022-05-20 12:53:10 +02:00
Alex Moreno	34bcdf1bd3	test(account): acl, connections and accounts secctions	2022-05-18 14:01:30 +02:00
Vicent Llopis	eeede417eb	feat: update date depending of accountingType	2022-05-17 12:24:35 +02:00
Vicent Llopis	ebbb0466a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-17 10:13:05 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz	b5ccd32800	Merge branch 'dev' into 3409-clientCredit_maxRows	2022-05-16 07:23:08 +00:00
Carlos Jimenez Ruiz	990f7fe4b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation	2022-05-13 18:37:48 +02:00
Carlos Jimenez Ruiz	dcdbafe25f	removed test failure	2022-05-13 12:58:06 +02:00
Carlos Jimenez Ruiz	dc62ec21b4	forced test failure to test CI junit check	2022-05-13 12:57:11 +02:00
Carlos Jimenez Ruiz	ddc3b552d7	jasmine reporters are now added using addReporter	2022-05-13 12:51:02 +02:00
Carlos Jimenez Ruiz	8b95150437	minor refactor on reporters definition	2022-05-13 12:44:21 +02:00
Carlos Jimenez Ruiz	fa55263516	renamed junit reporters constant	2022-05-13 12:35:39 +02:00
Carlos Jimenez Ruiz	42270bf61b	allowed both spec reporters for CI	2022-05-13 12:33:08 +02:00
Carlos Jimenez Ruiz	d4fab02252	junit reporter added for CI	2022-05-13 12:25:35 +02:00
Carlos Jimenez Ruiz	09a1dc62df	jasmine default timeout 30 secs on CI	2022-05-13 12:05:41 +02:00
Carlos Jimenez Ruiz	9be7d46fb2	added timeout to failing test	2022-05-13 11:57:36 +02:00
Joan Sanchez	ccf3366e1a	Timeout	2022-05-13 11:55:04 +02:00
Joan Sanchez	0c6852f35a	Included test	2022-05-13 11:52:49 +02:00
Joan Sanchez	65e68cf4dd	Increased timeout	2022-05-13 11:51:45 +02:00
Joan Sanchez	330763a745	Sleep	2022-05-13 11:46:44 +02:00
Joan Sanchez	490b5fc6df	Sleep	2022-05-13 11:44:04 +02:00
Joan Sanchez	35a579f06b	Launch on boot	2022-05-13 11:41:22 +02:00
Joan Sanchez	057d825be9	Log on boot	2022-05-13 11:37:31 +02:00
Joan Sanchez	d8ebc69612	Excluded back unit test	2022-05-13 11:31:18 +02:00
Joan Sanchez	2ed9b36b0d	Updated unit test	2022-05-13 11:23:09 +02:00
Joan Sanchez	5cbe5b6359	Updated unit test	2022-05-13 11:17:11 +02:00
Joan Sanchez	4479337731	Updated test	2022-05-13 10:59:13 +02:00
Joan Sanchez	649be482b5	Updated changePassword()	2022-05-13 10:52:05 +02:00
Joan Sanchez	75da4cfc3f	Disabled ldap sync	2022-05-13 10:22:05 +02:00
Joan Sanchez	04d86da48f	Run changePassword()	2022-05-13 08:47:53 +02:00
Carlos Jimenez Ruiz	526bc99c4f	docker container.run now receives boolean flag isCI	2022-05-12 13:51:31 +02:00
Carlos Jimenez Ruiz	cce1d93dde	jasmine reporters config for CI	2022-05-12 11:43:41 +02:00
Javi Gallego	0d63f3c3af	Merge branch 'dev' into 3851-dms_delete	2022-05-12 11:13:34 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Carlos Jimenez Ruiz	833addcb75	gulp-jasmine replaced by jasmine	2022-05-11 19:38:10 +02:00
Carlos Jimenez Ruiz	442644d3f1	Merge branch 'dev' into 3940-export_database	2022-05-11 12:57:29 +00:00
Alex Moreno	fde73b35e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 08:57:28 +02:00
Joan Sanchez	7365143eac	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-09 16:09:17 +02:00
Alex Moreno	d34a8629f7	fix(setSaleQuantity): save originalQuantity	2022-05-06 13:09:37 +02:00
Vicent Llopis	3fa86f0f15	fix: backTest	2022-05-06 09:08:34 +02:00
Vicent Llopis	a0af774837	fix: test	2022-05-06 09:02:52 +02:00