1184 Commits

Author	SHA1	Message	Date
Javier Segarra	a7c48b6ddc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01:00
Javier Segarra	57add7abf0	refs #5666 perf: replace Role by VnRole	2023-12-05 07:16:12 +01:00
Javier Segarra	2fe631f078	refs #5666 feat: change models permissions	2023-12-05 07:15:22 +01:00
Javier Segarra	a8b0a7a5b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-12-04 14:46:21 +01:00
Javier Segarra	5656ed7a2b	refs #6264 perf: use functions extracted previously	2023-12-04 14:46:05 +01:00
Javier Segarra	b9671c0b67	refs #6264 perf: remove files related to token	2023-12-04 14:44:50 +01:00
Carlos Satorres	051c93a42c	remove fdescribe	2023-12-04 09:41:24 +01:00
Carlos Satorres	c0ce7e542f	refs #6085 solve testback	2023-12-04 09:40:57 +01:00
Carlos Satorres	6d486fbec9	refs #6085 trad, remove front, back test	2023-12-01 13:58:45 +01:00
Jorge Penadés	30b63f577f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-12-01 09:49:49 +01:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Javier Segarra	58855a7cdd	refs #6434 perf: remove bad characters method description	2023-11-30 08:14:56 +01:00
Javier Segarra	d4cd23853f	refs #6264 perf: try to remove jasmine.clock()	2023-11-30 07:32:16 +01:00
Javier Segarra	9176cdb4cb	refs #6434 perf: new field in SignInLog table	2023-11-29 19:34:00 +00:00
Javier Segarra	ed6c0924d7	refs #6434 perf: remove console.error	2023-11-29 19:33:04 +00:00
Javier Segarra	48b82b02ca	refs #6434 change param type for signInValidate	2023-11-29 19:32:10 +00:00
Jorge Penadés	375cb1acc0	refs #6276 console removed	2023-11-29 16:28:14 +01:00
Jorge Penadés	27d223cbab	refs #6276 machineWorker_add	2023-11-29 16:25:15 +01:00
Jorge Penadés	877c679273	refs #6276 getVersion	2023-11-29 13:22:44 +01:00
Jorge Penadés	133fe1065a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-29 09:44:09 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00
Javier Segarra	bb9723b65d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-11-28 08:18:11 +01:00
Javier Segarra	f5f2896cbf	refs 5666 feat: replace Role model by VnRole model	2023-11-28 08:12:16 +01:00
Alex Moreno	7911cc12df	Merge branch 'dev' into 6489-authSupport	2023-11-27 12:57:46 +00:00
Carlos Satorres	a7361a89bd	refs #6489 remove auth	2023-11-27 12:58:07 +01:00
Javier Segarra	9da5fb9a14	refs #6264 other: rename camel-case variable	2023-11-27 10:24:25 +01:00
Javier Segarra	901a44cc62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-27 09:48:31 +01:00
Javier Segarra	81be3b18f7	refs #6264 test: validate-token and renew-token	2023-11-27 09:48:15 +01:00
Javier Segarra	72a0932e35	refs #6264 other: rename camel-case variable	2023-11-27 09:46:27 +01:00
Jorge Penadés	8ac3887d80	refs #5811 rename methods	2023-11-24 10:53:38 +01:00
Jorge Penadés	c56588a472	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-24 10:18:47 +01:00
Javi Gallego	4a62588464	Merge pull request '6028_route_getRouteByWorker' (!1857) from 6028_route_getRouteByWorker into dev ... Reviewed-on: #1857 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-23 14:01:53 +00:00
Jorge Penadés	1f9030c36d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-23 13:35:46 +01:00
Jorge Penadés	eeef279483	refs #5811 replace decription	2023-11-23 13:34:29 +01:00
Jorge Penadés	f862ed7d8a	refs #6274 refactor updateInTime	2023-11-23 13:19:59 +01:00
Jorge Penadés	cf3b5efee9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse	2023-11-23 12:36:19 +01:00
Alex Moreno	4735307f5d	refs #5890: fix(Collection/getTickets): accepts iss.quantity nulls	2023-11-23 11:49:00 +01:00
Jorge Penadés	900dffbbba	refs #5811 delete viaexpress expeditions included	2023-11-23 10:26:28 +01:00
Javi Gallego	f44424dbcf	test: refs #6028 test	2023-11-23 09:44:47 +01:00
Jorge Penadés	fac6aab26c	refs #6276 machineWorker_update	2023-11-22 14:25:19 +01:00
Sergio De la torre	707173d618	refs #5890 fix: getTickets	2023-11-22 07:04:33 +01:00
Jorge Penadés	251578146e	refs #6276 several methods created	2023-11-21 12:32:36 +01:00
Jorge Penadés	3f8d1ff617	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-21 10:17:31 +01:00
Alex Moreno	e25ca914a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-20 10:13:02 +01:00
Alex Moreno	7951b874a6	Merge branch 'dev' into 6264-renewToken	2023-11-20 06:39:50 +00:00
Alex Moreno	aea3f7b2b9	refs #6434 fix: use trim	2023-11-16 15:10:47 +01:00
Alex Moreno	83ae0379b5	refs #6434 fix: console.log	2023-11-16 12:28:35 +01:00
Javier Segarra	abf772ae87	refs #6434 feat: check if signIn inserts signInLog	2023-11-16 10:43:00 +01:00
Javier Segarra	386b556216	refs #6434 feat: new test user signIn with email	2023-11-16 10:29:57 +01:00
Javier Segarra	579cd832c0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER	2023-11-16 10:08:06 +01:00
Alex Moreno	9c6b594426	hotFix: comment error logIn	2023-11-16 10:04:34 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Alex Moreno	54e8e6a27d	refs #6417 fix(vnUser): toLowerCase	2023-11-16 09:10:45 +01:00
Javier Segarra	3c8ed3ff51	refs #6434 feat: username.toLowerCase()	2023-11-16 08:30:27 +01:00
Javier Segarra	c6b5d7f5a4	refs #6434 feat: rename id key by token	2023-11-16 08:30:01 +01:00
Alex Moreno	5bdf6a7338	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-16 07:56:23 +01:00
Javier Segarra	58edcb9055	refs #6434 feat: save token in db for each login	2023-11-15 13:50:06 +01:00
Javier Segarra	0a31968cc7	refs #6434 feat: show error for wrong login	2023-11-15 13:49:54 +01:00
Javier Segarra	11352798f0	refs #6434 feat: save token in db for each login	2023-11-15 09:41:12 +01:00
Javier Segarra	e25b7d0a12	refs #6434 feat: show error for wrong login	2023-11-15 09:39:51 +01:00
Javier Segarra	add3a81032	refs #6434 feat: remove recursively fn	2023-11-15 09:29:26 +01:00
Javier Segarra	7f82243ce6	refs #6434 feat: create signInLog table	2023-11-14 15:00:03 +01:00
Javier Segarra	5c777c705f	refs #6434 feat: add new error message	2023-11-14 13:00:20 +01:00
Alex Moreno	1a66987cd0	refs #5979 fix(vn-user): resetPassword url	2023-11-13 12:26:31 +01:00
Javier Segarra	384b5eb7c7	refs #5666 remove old file	2023-11-13 09:56:16 +01:00
Javier Segarra	aab88dc7de	refs #5666 perf: use use loggable as mixin	2023-11-13 09:54:12 +01:00
Javier Segarra	3c5af184bb	refs #5666 feat: use mixin for this models	2023-11-10 15:12:49 +01:00
Javier Segarra	cf3cc37d97	refs #5666 feat: create mixin	2023-11-10 15:12:24 +01:00
Javier Segarra	5dbfe31a60	refs #5666 feat: define VnRole	2023-11-10 15:12:03 +01:00
Javier Segarra	bcccd1894c	refs #6264 test: init test	2023-11-10 13:13:17 +01:00
Alex Moreno	204323ac69	test(notification_getList): fix	2023-11-08 14:57:07 +01:00
Alex Moreno	0de5bc5109	refs #4797 refactor: getList & notificationSubscription method	2023-11-08 14:56:47 +01:00
Javier Segarra	784f5bb7f9	refs #6264 perf: replace now with vnNew	2023-11-07 23:23:02 +01:00
Javier Segarra	67faf076d2	refs '#6264' feat: memoization accessTokenConfig	2023-11-04 16:51:25 +01:00
Javier Segarra	8c6eab23e5	handle expired token and return new token	2023-11-04 14:39:26 +01:00
Alex Moreno	d06810b1b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-03 14:58:55 +01:00
Jorge Penadés	2cdebcd69f	check bank entity refs 5834	2023-11-03 09:15:41 +01:00
Alex Moreno	03e2f57306	refs #6067 fix: emailVerify url	2023-11-02 10:57:50 +01:00
Alex Moreno	30895f444f	Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress	2023-10-26 12:14:31 +00:00
Alex Moreno	ae27aa5b1e	fix: test to dev	2023-10-23 10:08:26 +02:00
Alex Moreno	dc00b85bec	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-23 08:31:37 +02:00
Alex Moreno	2edfacb91c	refs #5979 fix(sendCheckingPresence)!	2023-10-23 07:33:52 +02:00
Pablo Natek	0237517f0c	Merge branch 'master' into 5979-getAppOrigin	2023-10-20 10:55:30 +00:00
Pablo Natek	5c69d9c7f0	fix: add await in async functions refs #5979	2023-10-20 12:53:54 +02:00
Alex Moreno	ef1ddfd484	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-20 09:28:37 +02:00
Alex Moreno	cadec7d01f	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 11:36:14 +00:00
Guillermo Bonet	5c51d7fb04	Merge branch 'test' into dev	2023-10-19 13:22:33 +02:00
Alex Moreno	d9ab607126	refs #6199 feat(sale): increase quantity if newPrice is higher	2023-10-19 13:03:11 +02:00
Alex Moreno	1ea6b87266	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 10:48:51 +00:00
Alex Moreno	3294937b54	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 08:50:29 +00:00
Jorge Penadés	5b1e5743b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-19 09:35:37 +02:00
Pablo Natek	f1b11fdca2	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 06:51:50 +00:00
Pablo Natek	f8889df903	remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979	2023-10-19 08:40:25 +02:00
Pablo Natek	488181e1b6	feat(getUrl): se añade el metodo getUrl refs #5979	2023-10-19 08:37:28 +02:00
Alex Moreno	b1c931a510	remove console.log	2023-10-18 08:52:17 +02:00
Alex Moreno	b3c7511e59	refs #6067 feat(url): getByUser	2023-10-18 08:52:06 +02:00
Alex Moreno	6871ce4b15	Merge branch '6067-vnUser_privileges_and_verifyEmail' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-18 07:29:03 +02:00
Alex Moreno	a916007314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-18 07:20:34 +02:00
Pablo Natek	9870a0e60a	feat(origin): create method url_/geturl redf #5979	2023-10-17 13:56:49 +02:00
Alex Moreno	d4770c525e	refs #6199 test(sale): fix test	2023-10-17 11:00:41 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +02:00
Jorge Penadés	bd535374d8	ref #6138 setPasword created	2023-10-16 15:58:25 +02:00
Pablo Natek	f832c1d9ec	refs #5979 getUrl	2023-10-15 11:08:33 +02:00
Javi Gallego	726bc26a75	fixes #6260 vn-user quito campos redundantes	2023-10-05 09:40:05 +02:00
Alex Moreno	8c39f65dc3	refs #6067 feat: url model to everyone	2023-10-03 09:36:11 +02:00
Alex Moreno	4545a63214	refs #6067 feat(vnUser): verifyEmail redirect to lilium	2023-10-02 14:51:19 +02:00
Carlos Andrés	17e6cffa3d	refs #6254 collection getTickets	2023-09-29 13:47:29 +02:00
Carlos Andrés	41ac907b05	refs #6254-collection_getTickets	2023-09-29 13:44:41 +02:00
Carlos Andrés	2820b0253f	Merge branch 'test' into 6254-collection_getTickets	2023-09-29 10:31:14 +00:00
Carlos Andrés	9a7cb3ef7b	refs #6254 collection_getTickets	2023-09-29 12:30:05 +02:00
Alex Moreno	d4e5815d41	refs #6254 feat(collection_getTickets): refactor code and add test	2023-09-28 08:30:50 +02:00
Alex Moreno	1307d4727c	refs #6254 feat(collection): add getTickets	2023-09-27 15:08:36 +02:00
Alex Moreno	6cf1095b10	refs #6067 feat: vnUser use verify() and more security when update user and mailForward	2023-09-25 08:33:16 +02:00
Alex Moreno	db7f72e262	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-09-22 13:19:35 +02:00
Carlos Satorres	1f1dfae7e3	refs #5843 changes models	2023-09-21 12:50:07 +02:00
Alex Moreno	3b90d7e5e5	refs #6067 refactor: vnUser and mailForward privileges. fix: emailVerification	2023-09-20 15:10:28 +02:00
Alex Moreno	2dbd711104	Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress	2023-09-19 05:24:05 +00:00
Guillermo Bonet	a6b730ecc2	Merge branch 'test' into dev	2023-09-18 09:54:33 +02:00
Guillermo Bonet	690df509d3	refs #5684 Fixed no error	2023-09-18 07:10:12 +02:00
Sergio De la torre	4c1ff2e4d7	refs #6141feat:buyer model	2023-09-14 08:27:49 +02:00
Vicent Llopis	f3e43686a3	refs #5811 feat: al borrar expedicion borrar tmb de viaexpress	2023-08-24 14:59:28 +02:00
Alex Moreno	508a4b2d34	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-08-23 12:04:27 +02:00
Alex Moreno	a26652045c	refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel	2023-08-22 10:17:46 +02:00
Alex Moreno	14d4de0e1f	refs #5941 fix(sendToSupport): add as a collaborator	2023-08-21 14:48:05 +02:00
Alex Moreno	36623c1cae	refs #5941 fix(sendToSupport): fix email from	2023-08-21 13:48:51 +02:00
Alex Moreno	02dddaeffe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5941-send-to-support	2023-08-11 11:55:02 +02:00
Alex Moreno	4c199f66b2	refs #5762 refactor: recoverPassword use app param	2023-08-04 14:33:38 +02:00
Alex Moreno	75d3d12ae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5762-recoverPassword-multiplatform	2023-08-04 14:31:56 +02:00
Alex Moreno	fd9b842e6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-08-02 13:58:40 +02:00
Juan Ferrer	3e8bb221e0	refs #5762 Securify fix for recovery url	2023-08-02 09:29:09 +02:00
Vicent Llopis	fbc1e28031	Merge branch 'dev' into 4734-addViaexpress	2023-07-28 07:54:26 +00:00
Alex Moreno	305caaf8aa	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-27 07:20:34 +02:00
Alex Moreno	47b2aa0ee7	Merge branch 'dev' into 5941-send-to-support	2023-07-26 05:10:30 +00:00
Alex Moreno	bf92c5d482	refs #6059 validateLogin sync user	2023-07-25 15:00:08 +02:00
Alex Moreno	23308d7ae3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-21 12:40:59 +02:00
Alex Moreno	985e258529	refs #5769 fix(web-access): email rule	2023-07-21 12:33:14 +02:00
Vicent Llopis	1215b8cd57	Merge branch 'dev' into 5849-makeInvoice_solved	2023-07-20 08:15:57 +00:00
Alex Moreno	aefcb8c49a	Merge branch 'dev' into 5837-quitRestrictionFrance	2023-07-20 06:40:23 +00:00
Vicent Llopis	4755c50cd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5849-makeInvoice_solved	2023-07-20 07:22:30 +02:00
Vicent Llopis	7bd378e9dd	refs #	2023-07-18 14:15:56 +02:00
Vicent Llopis	834e4b3723	refs #4734 refactor: variables definindas	2023-07-18 07:56:44 +02:00
Alex Moreno	125d908c5d	refs #5762 uncomment	2023-07-17 14:41:15 +02:00
Alex Moreno	d2120cdc3d	refs #5762 feat: multiplatform recover-password and change-password	2023-07-17 14:24:50 +02:00
Alex Moreno	9097a1dc28	refs #5941 feat: sendToSuppor component and fix CSS and JSON format	2023-07-14 14:30:08 +02:00
Carlos Satorres	765c22df96	refs #5837 new table	2023-07-14 11:30:13 +02:00
Alex Moreno	7881385f4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5941-send-to-support	2023-07-14 07:53:40 +02:00
Vicent Llopis	c91db1b429	a	2023-07-13 10:19:57 +02:00
Vicent Llopis	112d7a84e3	solved test	2023-07-13 09:32:08 +02:00
Vicent Llopis	17b2b02246	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress	2023-07-13 09:16:32 +02:00
Alex Moreno	ac4e264d53	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-07-13 08:43:50 +02:00
Vicent Llopis	7aaaf5492c	refs #5887 refacotr: move code to hook	2023-07-12 15:07:06 +02:00
Vicent Llopis	551d06ee83	refs #5887 para eliminar sigue las mismas reglas que para añadir	2023-07-12 13:55:57 +02:00
Alex Moreno	9cb29b9166	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-07-12 13:05:17 +02:00
Vicent Llopis	808a9976ab	refs #5887 fix: back etst	2023-07-11 13:53:25 +02:00
Vicent Llopis	a215797390	tranalstion	2023-07-11 13:39:22 +02:00
Vicent Llopis	d4217ff8d3	refs #5887 correct translations	2023-07-11 13:38:48 +02:00
Vicent Llopis	5a5a1ed20b	refs #5887 feat: addback test	2023-07-11 13:22:54 +02:00
Vicent Llopis	e1f12bea02	a	2023-07-11 12:33:44 +02:00
Vicent Llopis	d4a4e04f25	refs #5887 feat: cambiados permisos para añadir/quitar alias de correo	2023-07-11 12:33:34 +02:00
Alex Moreno	444b08c566	refs #5712 test(docuware)	2023-07-05 12:09:52 +02:00
Alex Moreno	1a18ba66a9	refs #5712 fix(workerDms): filter	2023-07-04 15:18:57 +02:00
Alex Moreno	c7b9d0827e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-07-03 13:42:54 +02:00
Alex Moreno	461e1d4d5d	refs #5475 feat: userUses, fix forbiddenError and merge in dev	2023-07-03 13:33:48 +02:00
Alex Moreno	467c4e997c	refs #5941 feat: when error can send email to support	2023-06-30 14:24:50 +02:00
Vicent Llopis	3bd890c343	refs #5554 fix: solo llama al back cuando se tiene q renovar	2023-06-29 12:11:16 +02:00
Alex Moreno	840a88bdc1	refs #5833 remove console.logs	2023-06-29 07:14:45 +02:00
Alex Moreno	befa385830	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware	2023-06-28 14:30:20 +02:00
Alex Moreno	89c25c07b6	refs #5475 fix e2e and back test	2023-06-28 09:59:55 +02:00
Alex Moreno	162faf0d01	Merge branch '5475-email_2fa' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-28 07:18:10 +02:00
Alex Moreno	4b8b7a9d82	refs #5475 fix accessScope	2023-06-27 15:30:54 +02:00
Alex Moreno	1cf5ff9a62	refs #5554 new Date()	2023-06-27 08:24:31 +02:00
Alex Moreno	46ffd8d95a	refs #5554 console.log	2023-06-27 08:07:54 +02:00
Alex Moreno	798481b24a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-26 07:53:44 +02:00
Alex Moreno	6ab431f8ef	refs #5475 tests	2023-06-21 14:17:25 +02:00
Vicent Llopis	d9afdccd9c	fix: acl renewToken	2023-06-21 14:12:42 +02:00
Alex Moreno	d6c504d3bb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-21 07:53:40 +02:00
Vicent Llopis	f37974c835	Merge branch 'dev' into 5468-account_privileges	2023-06-20 12:39:27 +00:00
Vicent Llopis	f6cb1cb130	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:07:52 +00:00
Vicent Llopis	4444b45b08	refs #4734 feat: se utiliza la libreria ejs y xmldom	2023-06-20 14:07:36 +02:00
Vicent Llopis	13e95bcd35	add vue commented code	2023-06-20 11:25:47 +02:00
Alex Moreno	5a6a18c76a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-20 09:20:54 +02:00
Vicent Llopis	c3af2e3c92	refs #4734 refactor: actualizada descripcion	2023-06-20 07:19:32 +02:00
Alex Moreno	092471f74e	refs #5475 feat(account_changePassword): accessScope and backTest	2023-06-19 15:06:06 +02:00
Vicent Llopis	cfe340eeff	refs #4734 feat: xml en otro archivo	2023-06-19 14:27:24 +02:00
Vicent Llopis	303be74382	refs #4734 refactor: use loopback instead of	2023-06-19 11:55:07 +02:00
Alex Moreno	ee1b901dea	refs #5475 feat(account_changePassword): accessScope	2023-06-16 14:31:14 +02:00
Vicent Llopis	219ad75172	a	2023-06-16 14:30:33 +02:00
Vicent Llopis	ab68cb7165	refs #4734 fix: manejo errores	2023-06-16 14:27:29 +02:00
Vicent Llopis	90ce0d1c27	refs #4734 refactor: consulta con loopback	2023-06-16 14:24:47 +02:00
Vicent Llopis	998597dfcc	refs #4734 recator: cambiado nombre ruta	2023-06-16 13:49:21 +02:00
Alex Moreno	dd157d59d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa	2023-06-16 13:42:13 +02:00
Vicent Llopis	425118d333	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress	2023-06-16 13:09:38 +02:00
Alex Moreno	75bb0f8160	refs #5860 fix hash smbhash	2023-06-16 12:19:59 +02:00
Alex Moreno	cf01c8d46e	refs #5475 feat(account_changePassword)	2023-06-16 09:35:20 +02:00
Alex Moreno	b96f0f22b5	refs #5475 feat(account_changePassword)	2023-06-15 15:16:51 +02:00
Alex Moreno	5163b7b253	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-15 15:14:41 +02:00
Alex Moreno	99ad9d3afa	refs #5753 fix(change-password)	2023-06-15 11:49:39 +02:00
Alex Moreno	3a5e591cf0	refs #5475 feat(signin): use twoFactor and passExpired	2023-06-14 15:15:00 +02:00
Alex Moreno	aa2d3be451	typo	2023-06-14 07:30:50 +02:00
Vicent Llopis	0cc5781f3f	refs #4734 feat: añadido método putExpedicionInternacional de viaexpress	2023-06-13 15:05:37 +02:00
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