Commit Graph

975 Commits

Author SHA1 Message Date
Alex Moreno e25ca914a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-20 10:13:02 +01:00
Alex Moreno 7951b874a6 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 06:39:50 +00:00
Javier Segarra abf772ae87 refs #6434 feat: check if signIn inserts signInLog
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 10:43:00 +01:00
Javier Segarra 386b556216 refs #6434 feat: new test user signIn with email
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 10:29:57 +01:00
Alex Moreno f677382f96 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:29:53 +01:00
Javier Segarra c6b5d7f5a4 refs #6434 feat: rename id key by token 2023-11-16 08:30:01 +01:00
Javier Segarra 58edcb9055 refs #6434 feat: save token in db for each login
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 13:50:06 +01:00
Javier Segarra 11352798f0 refs #6434 feat: save token in db for each login
gitea/salix/pipeline/head Build queued... Details
2023-11-15 09:41:12 +01:00
Javier Segarra bcccd1894c refs #6264 test: init test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-10 13:13:17 +01:00
Alex Moreno 204323ac69 test(notification_getList): fix
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 14:58:55 +01:00
Alex Moreno 30895f444f Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 12:14:31 +00:00
Alex Moreno dc00b85bec Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-23 08:31:37 +02:00
Alex Moreno 2edfacb91c refs #5979 fix(sendCheckingPresence)!
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 07:33:52 +02:00
Pablo Natek 0237517f0c Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 09:28:37 +02:00
Alex Moreno cadec7d01f Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:36:14 +00:00
Alex Moreno d9ab607126 refs #6199 feat(sale): increase quantity if newPrice is higher
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:03:11 +02:00
Pablo Natek f1b11fdca2 Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head Build queued... Details
2023-10-19 08:40:25 +02:00
Pablo Natek 488181e1b6 feat(getUrl): se añade el metodo getUrl refs #5979
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 08:37:28 +02:00
Alex Moreno b3c7511e59 refs #6067 feat(url): getByUser 2023-10-18 08:52:06 +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
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 11:00:41 +02:00
Pablo Natek 033c02750b refactor(origin): .origin por getUrl()
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 18:24:58 +02:00
Pablo Natek f832c1d9ec refs #5979 getUrl 2023-10-15 11:08:33 +02:00
Alex Moreno 4545a63214 refs #6067 feat(vnUser): verifyEmail redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-02 14:51:19 +02:00
Carlos Andrés 17e6cffa3d refs #6254 collection getTickets
gitea/salix/pipeline/head This commit looks good Details
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 9a7cb3ef7b refs #6254 collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-29 12:30:05 +02:00
Alex Moreno d4e5815d41 refs #6254 feat(collection_getTickets): refactor code and add test
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 08:30:50 +02:00
Alex Moreno 1307d4727c refs #6254 feat(collection): add getTickets
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 08:33:16 +02:00
Alex Moreno 2dbd711104 Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-09-19 05:24:05 +00:00
Guillermo Bonet 690df509d3 refs #5684 Fixed no error
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 07:10:12 +02:00
Vicent Llopis f3e43686a3 refs #5811 feat: al borrar expedicion borrar tmb de viaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-08-24 14:59:28 +02:00
Alex Moreno 508a4b2d34 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-08-23 12:04:27 +02:00
Alex Moreno a26652045c refs #5712 hotFix(docuware): tickets. hotFix(catalog): search_panel
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:17:46 +02:00
Alex Moreno 14d4de0e1f refs #5941 fix(sendToSupport): add as a collaborator
gitea/salix/pipeline/head This commit looks good Details
2023-08-21 14:48:05 +02:00
Alex Moreno 36623c1cae refs #5941 fix(sendToSupport): fix email from
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
Vicent Llopis fbc1e28031 Merge branch 'dev' into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 07:54:26 +00:00
Alex Moreno 47b2aa0ee7 Merge branch 'dev' into 5941-send-to-support
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-26 05:10:30 +00: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
gitea/salix/pipeline/head This commit looks good Details
2023-07-21 12:33:14 +02:00
Vicent Llopis 834e4b3723 refs #4734 refactor: variables definindas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 07:56:44 +02:00
Alex Moreno d2120cdc3d refs #5762 feat: multiplatform recover-password and change-password
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:24:50 +02:00
Alex Moreno 9097a1dc28 refs #5941 feat: sendToSuppor component and fix CSS and JSON format
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 14:30:08 +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
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 10:19:57 +02:00
Vicent Llopis 112d7a84e3 solved test
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 09:32:08 +02:00
Vicent Llopis 17b2b02246 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 09:16:32 +02:00
Alex Moreno ac4e264d53 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 08:43:50 +02:00
Vicent Llopis 7aaaf5492c refs #5887 refacotr: move code to hook
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 15:07:06 +02:00
Vicent Llopis 551d06ee83 refs #5887 para eliminar sigue las mismas reglas que para añadir
gitea/salix/pipeline/head Build queued... Details
2023-07-12 13:55:57 +02:00
Alex Moreno 9cb29b9166 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-07-12 13:05:17 +02:00
Vicent Llopis 808a9976ab refs #5887 fix: back etst
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 13:53:25 +02:00
Vicent Llopis a215797390 tranalstion
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-07-11 13:22:54 +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)
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 12:09:52 +02:00
Alex Moreno c7b9d0827e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 13:42:54 +02:00
Alex Moreno 461e1d4d5d refs #5475 feat: userUses, fix forbiddenError and merge in dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 13:33:48 +02:00
Alex Moreno 467c4e997c refs #5941 feat: when error can send email to support
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-30 14:24:50 +02:00
Vicent Llopis 3bd890c343 refs #5554 fix: solo llama al back cuando se tiene q renovar
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 12:11:16 +02:00
Alex Moreno 840a88bdc1 refs #5833 remove console.logs
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 14:30:20 +02:00
Alex Moreno 89c25c07b6 refs #5475 fix e2e and back test
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-27 15:30:54 +02:00
Alex Moreno 1cf5ff9a62 refs #5554 new Date()
gitea/salix/pipeline/head This commit looks good Details
2023-06-27 08:24:31 +02:00
Alex Moreno 46ffd8d95a refs #5554 console.log
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 14:17:25 +02:00
Vicent Llopis d9afdccd9c fix: acl renewToken
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 07:53:40 +02:00
Vicent Llopis f6cb1cb130 Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 12:07:52 +00:00
Vicent Llopis 4444b45b08 refs #4734 feat: se utiliza la libreria ejs y xmldom
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 14:07:36 +02:00
Vicent Llopis 13e95bcd35 add vue commented code
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 11:25:47 +02:00
Vicent Llopis c3af2e3c92 refs #4734 refactor: actualizada descripcion
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 07:19:32 +02:00
Alex Moreno 092471f74e refs #5475 feat(account_changePassword): accessScope and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-19 15:06:06 +02:00
Vicent Llopis cfe340eeff refs #4734 feat: xml en otro archivo
gitea/salix/pipeline/head This commit looks good Details
2023-06-19 14:27:24 +02:00
Vicent Llopis 303be74382 refs #4734 refactor: use loopback instead of
gitea/salix/pipeline/head This commit looks good Details
2023-06-19 11:55:07 +02:00
Alex Moreno ee1b901dea refs #5475 feat(account_changePassword): accessScope
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 14:31:14 +02:00
Vicent Llopis 219ad75172 a
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 14:30:33 +02:00
Vicent Llopis ab68cb7165 refs #4734 fix: manejo errores
gitea/salix/pipeline/head Build queued... Details
2023-06-16 14:27:29 +02:00
Vicent Llopis 90ce0d1c27 refs #4734 refactor: consulta con loopback
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 14:24:47 +02:00
Vicent Llopis 998597dfcc refs #4734 recator: cambiado nombre ruta
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 13:42:13 +02:00
Vicent Llopis 425118d333 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 13:09:38 +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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-14 15:15:00 +02:00
Alex Moreno aa2d3be451 typo
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 07:30:50 +02:00
Vicent Llopis 0cc5781f3f refs #4734 feat: añadido método putExpedicionInternacional de viaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 15:05:37 +02:00
Alex Moreno dd4b62d0a5 description
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-13 11:49:42 +02:00
Alex Moreno 92953b9aa8 refs #5094 test(docuware): adapt tests
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 07:43:23 +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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-12 15:20:46 +02:00
Alex Moreno 5c1b867d05 WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 09:11:17 +02:00
Alex Moreno e5ababb0a9 Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-07 11:49:40 +00:00
Alex Moreno edc601fd5d refs #5489 fix(account/sync), fix(order) catalog-search-panel popover
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 13:34:13 +02:00
Vicent Llopis 3fdb546d86 refs #5554 refactor: eliminado vnTokenCreated y añadido a vnToken.created
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 08:50:53 +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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-05 08:11:47 +02:00
Alex Moreno bca7224f74 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-05 08:09:16 +02:00
Guillermo Bonet 5b0a1d10bb refs #5684 edi/updateData fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-02 07:51:01 +02:00
Alex Moreno d134ca45f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 14:19:23 +02:00
Alexandre Riera f9528b922c refs #5595 added userId in options
gitea/salix/pipeline/head This commit looks good Details
2023-06-01 08:32:06 +02:00
Alex Moreno f0024346a8 refs #5712 openDocuware
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-31 11:32:37 +02:00
Alex Moreno c23d8282eb refs #5712 feat(workerDms): docuware download
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:06:31 +02:00
Vicent Llopis 2b34dd19e8 refs #554 delete: test back que falla
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 12:06:15 +02:00
Alex Moreno b60cd2539a refs #5712 feat(workerDms): docuware integration
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-26 07:41:48 +02:00
Vicent Llopis 06d1de5a63 refs #5554 feat: add back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 12:06:40 +02:00
Vicent Llopis 91700e096e refs #5554 fix: cambiada extensión de archivos de test, y solucionado test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-25 11:51:27 +02:00
Vicent Llopis f471d62d41 refs #5554 refactor: 'renewToken' utiliza logout y createAccessToken
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 10:09:38 +02:00
Vicent Llopis 6010bc1253 refs #5554 movido codigo al vnLayout y parar el evento periódico
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 09:51:56 +02:00
Alex Moreno 37a3275b27 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 15:01:59 +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
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 05:55:08 +00:00
Alex Moreno 0045edb698 refs #5094 fix get email
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:39:43 +02:00
Juan Ferrer da0aa57539 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 19:06:20 +02:00
Alex Moreno 3189799b4c correct type
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 14:45:00 +02:00
Alex Moreno ddab59a10c refs #5472 refactor(changePassword): convert in async
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-22 09:17:40 +02:00
Alex Moreno c6c15d7c69 refs #5472 feat: changePassword with passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 14:44:19 +02:00
Alex Moreno 15a1965a53 refs #5094 add scopes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:12:46 +02:00
Alexandre Riera 2c254cbc08 refs #4797 added fields
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 14:34:32 +02:00
Alexandre Riera 7bcb00c127 refs #5655 removed relation
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 08:55:11 +02:00
Alexandre Riera 33ef9bdf61 refs #4797 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 07:18:58 +02:00
Alexandre Riera 9cb756544e refs #4797 added id to notification in activeNotifications
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 14:13:38 +02:00
Alexandre Riera f9e7963e74 refs #4797 minor fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 14:10:00 +02:00
Alexandre Riera 5171e63188 refs #4797 minor fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 14:20:20 +02:00
Alexandre Riera e7d16dc8ba refs #4797 fix test, add getList
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 11:34:32 +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 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
gitea/salix/pipeline/head There was a failure building this commit Details
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 79e7e7c604 refs #5472 feat: add change-password section
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 15:16:13 +02:00
Alex Moreno 42e3c8f29d refs #5488 fix(): use hasWriteRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 09:35:15 +02:00
Alex Moreno 42fc0b62d8 refs #5472 feat(user): add passExpired
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 15:18:27 +02:00
Alexandre Riera 878f232fda Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 14:20:23 +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
Alex Moreno c1d4281b1b refs #5488 replace hasWriteRole, hasReadRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:59:26 +02:00
Joan Sanchez c3443ecc7c Updated e2e
gitea/salix/pipeline/head This commit looks good Details
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 ef87dcc0f5 require authentication on every login
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 07:38:40 +02:00
Joan Sanchez 3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-04-15 14:24:50 +02:00
Joan Sanchez 35f94c58b7 reafactor(image): upload image using gm library
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 13:04:40 +02:00
Joan Sanchez 9aaea7e8ed Changed to new SQL version
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 12:01:51 +02:00
Joan Sanchez b5f2cf3711 Added unit test & translation fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 11:54:56 +02:00
Joan Sanchez 4807fcb394 Removed focus
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 09:01:59 +02:00
Joan Sanchez b0f1bae33e Added unit test
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 14:59:25 +02:00
Joan Sanchez f4ff869c4d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-04-03 08:55:51 +02:00
Joan Sanchez 02a1bcbfd3 fix(setPassword): proper access type
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Joan Sanchez cc759373a1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-29 15:20:57 +02:00
Vicent Llopis b0d205c4da refs #5464 fix: utiliza una sola cookie
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 13:36:23 +02:00
Vicent Llopis dca760d4e4 Merge branch 'dev' into 4858-chat_realTime
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:02:51 +00:00
Alexandre Riera 4e5364dc0b refs #5036 fix tests logs
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 10:05:02 +01:00
Vicent Llopis 4141a97356 refs #4858 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head Build queued... Details
2023-03-21 11:26:41 +01:00
Vicent Llopis d1f0ae3865 refs #4858 fix: filtro corregido
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 11:26:25 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head Build queued... Details
2023-03-16 08:06:17 +00:00
Joan Sanchez 6495e016a8 Endpoints refactor
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 08:17:46 +01:00
Joan Sanchez 63d7dafcde feat(print): added reusable pdf print functions
gitea/salix/pipeline/head There was a failure building this commit Details
Refs #5182
2023-03-13 15:05:19 +01:00
Alexandre Riera 106f96b9a6 refs #4713 fixed front test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:10:08 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
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 2a4d41cbca refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-24 14:41:02 +01:00
Joan Sanchez 90e1136ee2 fix(image): store images with a name generated through uuid instead of url path
gitea/salix/pipeline/head This commit looks good Details
Refs: #5266
2023-02-20 12:40:13 +01:00
Alex Moreno f06fc92ae8 refactor(chat): not use transactions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-08 15:15:26 +01:00
Alex Moreno 44055775cb fix: not use variables and direct send in send
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 14:44:00 +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 4a587049fc feat(recover-password): use user
gitea/salix/pipeline/head This commit looks good Details
refs #5170
2023-02-01 15:13:38 +01:00
Joan Sanchez e34d64361b Account refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:57:24 +01:00
Alex Moreno d77730dd47 fix: mockedDate in e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 10:10:25 +01:00
Joan Sanchez f0b44a2992 Updated back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 10:35:21 +01:00
Joan Sanchez 89eb065f6d Updated models 2023-01-24 09:04:43 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 07:42:36 +01:00
Pau 51b2e5a3bc Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:37:07 +01:00
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +01:00
Alex Moreno 73c3f05377 refactor(docuware_upload): simplify json
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 13:33:59 +01:00
Joan Sanchez c489c4c6a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 08:55:01 +01:00
Vicent Llopis 1c532d81e8 fix: permite cerrar varios estados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 08:38:03 +01:00
Alex Moreno 5bb66fec3f test(docuware): back tests
gitea/salix/pipeline/head There was a failure building this commit Details
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'º
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:07:48 +01:00
Joan Sanchez fe6211e965 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 15:19:09 +01:00
Alex Moreno b8fe919b2a feat(docuware): upload deliveryNote file
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 15:03:23 +01:00
Vicent Llopis f103931e50 fix: se concatenan pq sino no muestra el id del ticket
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-01-10 08:14:13 +01:00
Alex Moreno 382aad2622 feat(docuware): upload and send pdf
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 15:11:53 +01:00
Vicent Llopis 201987fb99 feat: muestra el error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-09 11:42:16 +01:00
Vicent Llopis 0c6d335c4a refactor: machacar stack
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head Build queued... Details
2023-01-05 14:32:14 +01:00
Vicent Llopis 8f81aa2eeb fix: salta los tickets que estan bloqueados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-05 14:28:35 +01:00
Pau 4ae903191a Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 12:48:03 +00:00
Alex Moreno 46f36e1de1 try
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-04 15:03:45 +01:00
Alex Moreno d85717ca04 feat: chat in real time
gitea/salix/pipeline/head There was a failure building this commit Details
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
Alexandre Riera 6185b2f055 refs #5051 changed fixture
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:04:38 +01:00
Alexandre Riera c6083ebe61 refs #5051 fdescribe
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 11:53:47 +01:00
Alexandre Riera b5ef090080 refs #5051 json date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 11:39:50 +01:00
Alexandre Riera 5c2e85d499 refs #5051 consolelog date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 11:00:01 +01:00
Alexandre Riera 04d3d13e82 refs #5051 sub stmt
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 10:36:31 +01:00
Alexandre Riera 0ae76746ae refs #5051 limit stmt
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 10:20:44 +01:00
Alexandre Riera 17a7bfbf3b refs #5051 continue fixing test jenkins
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 10:11:52 +01:00
Alexandre Riera cef0152ef5 refs #5052 fixing jenkins test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:44:27 +01:00
Pau 7a5993b4fe Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-26 07:12:13 +01:00
Pau a8ca163321 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:49:41 +01:00
Pau 6ded11a4c2 requested changes refs #3681 @3h
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:35:11 +01:00
Pau aa716634db Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 10:53:37 +00:00
Pau 1430749892 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:02:02 +00:00
Vicent Llopis cb9ad5d012 refactor: show ticketId error
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 08:45:14 +01:00
Alex Moreno fb3f3c64c9 refs #4858
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-19 09:59:03 +01:00
Pau f652e86c78 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:47:08 +01:00
Alexandre Riera 6130547420 Merge branch 'dev' into 4503-opcion-rocket
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 12:42:42 +00:00
Joan Sanchez 11db08b32b Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2022-12-14 14:20:41 +01:00
Pau 5235ed5499 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 08:05:04 +00:00
Vicent Llopis e7173fe156 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 11:59:30 +01:00
Vicent Llopis 2bb6c1c1da fix: borra registros aunq no tengan file adjunto
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-01 07:54:32 +01:00
Pau a676351e5b Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 07:24:26 +01:00
Vicent Llopis 2801e11965 Merge branch 'dev' into DEV_fix_deleteTrashFiles
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 07:43:50 +00:00
Vicent Llopis d58e567295 fix: maneja si el dms no tiene file. Simplemente borra el registro
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 12:56:25 +01:00
Joan Sanchez 2210f8970c Fixes
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 12:26:58 +01:00
Vicent Llopis bd91d4a649 fix: añadida transacción 2022-11-25 11:50:24 +01:00
Joan Sanchez db64ba48fc fix(rocketchat): Removed parenthesis
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 08:45:26 +01:00
Pau 02f2724f2b Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 06:35:15 +00:00
Alex Moreno 7651dcb473 feat: resetPasswordRequest use more params
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 14:43:18 +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
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:31:55 +01:00
Alex Moreno f8e6b71bc6 typo
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 10:27:05 +01:00
Alex Moreno 77b2f9cbd9 user emailUser
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 10:25:25 +01:00
Alex Moreno d70d848717 fix: use vn email
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 09:57:07 +01:00
Pau 25764c0411 change error message
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:43:48 +01:00
Pau 5b4c1ad4e6 Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:26:59 +01:00
Pau 7038d67d94 Removed comments
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:04:58 +01:00
Pau 3199797ee0 remove missplaced method
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:04:19 +01:00
Pau 6ab28678c5 Removed unused require and insert statement
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:56:03 +01:00
Pau 0f0c4c0554 feat(save-sign implemented in salix back, refs 3681 @2h
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:40:55 +01:00
Pau 56201f4c1a Start implementing method refs #3681 @3h
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 13:37:16 +01:00
Alex Moreno 517422be8c refactor: not use axios
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:32:07 +01:00
Joan Sanchez 83590b3adf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 12:48:09 +01:00
Alex Moreno 9c671ed3a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:47:00 +01:00
Joan Sanchez e2101db706 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 07:35:04 +01:00
Joan Sanchez 231575d23e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 12:40:07 +01:00
Joan Sanchez d34936015b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 12:39:54 +01:00
Vicent Llopis 264b56378a Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-28 06:31:12 +00:00
Alex Moreno ad1b429d10 check if user has role from userToUpdate
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 08:09:47 +02:00
Alex Moreno 80617dd578 Merge branch 'dev' into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 05:33:45 +00:00
Alex Moreno 5c65314162 use findById
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 09:27:50 +02:00
Alex Moreno 3ffc098b56 feat(privileges): check if user has role from userToUpdate
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 09:01:09 +02:00
Pau c1c06f27d3 create save.js 2022-10-27 08:21:21 +02:00
Alex Moreno f65d06fc7d fixes #4073
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 08:27:28 +02:00
Vicent Llopis 5e0f976ad2 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 06:25:18 +00: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'
gitea/salix/pipeline/head This commit looks good Details
2022-10-19 10:35:41 +02:00
Vicent Llopis e6481af3a9 delete: transaction
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 13:13:14 +02:00
Alex Moreno c24b975f26 remove node_env
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 12:14:11 +02:00
Alex Moreno aef47d46b1 env test
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 12:12:10 +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
gitea/salix/pipeline/head This commit looks good Details
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
Joan Sanchez b2e98c9d73 Transaction
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 14:39:57 +02:00
Joan Sanchez d06492d367 Transaction error
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 14:28:14 +02:00
Alex Moreno 2e36164a98 fix(recover-password): use pint/Email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 10:06:25 +02:00
Alex Moreno ce2ad32ac9 add email template
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-06 11:54:16 +00:00
Joan Sanchez f2eaa9d0e5 Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 06:28:00 +00:00
Alex Moreno 7a690dd880 feat(user): add section privileges and remove changeRole in descriptor
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 14:20:57 +02:00
Alex Moreno dc605387ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:23:10 +02:00
Alex Moreno fc5460dc9e feat(account): send verifyEmail when change email and tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:21:58 +02:00
Alex Moreno c79f884526 feat(recover-password): open changePass in front and tests done
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 09:22:24 +02:00
Alex Moreno 00f5689825 feat(account): recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-21 15:15:19 +02:00
Vicent Llopis 04676d5d98 fix: jump to next iteration if file not found
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 08:56:13 +02:00
Joan Sanchez 71f8e73e55 Merge pull request '4155-close_tickets' (#1056) from 4155-close_tickets into dev
gitea/salix/pipeline/head Build queued... Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-09-20 15:21:01 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 09:45:28 +02:00
Vicent Llopis 6367f1ef05 refator: delete sensitive info
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 09:23:56 +02:00
Vicent Llopis 5fce5b3e4f refator: delete console.log
gitea/salix/pipeline/head This commit looks good Details
2022-09-15 08:38:00 +02:00
Vicent Llopis 28bf7bd747 feat: check general status 'open' to close ticket
gitea/salix/pipeline/head This commit looks good Details
2022-09-15 08:34:42 +02:00
Joan Sanchez 5a46444875 Use POST request method instead of GET
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 13:53:44 +02:00
Joan Sanchez fce26342a9 Return inside try-catch
gitea/salix/pipeline/head This commit looks good Details
2022-09-08 11:42:16 +02:00
Joan Sanchez 4251b0baeb Removed debug logs
gitea/salix/pipeline/head This commit looks good Details
2022-09-08 11:19:04 +02:00
Joan Sanchez b499de7c08 tx commit
gitea/salix/pipeline/head This commit looks good Details
2022-09-08 10:33:51 +02:00
Joan Sanchez 151e1b52ed Updated transaction
gitea/salix/pipeline/head This commit looks good Details
2022-09-08 09:21:05 +02:00
Joan Sanchez ab86ba0652 Disabled transaction
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 12:28:53 +02:00
Joan Sanchez aec053868d Debug logs
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 11:50:02 +02:00
Joan Sanchez 48916e2b07 Debug logs
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-09-07 11:26:58 +02:00
Joan Sanchez 8f86cacc96 Missing await
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 10:48:24 +02:00
Joan Sanchez aba1696ad7 Changes
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 10:26:32 +02:00
Joan Sanchez 7264595646 Throw error for max-retries
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 14:23:25 +02:00
Joan Sanchez 5c5440cdfc Removed callback
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 13:13:49 +02:00
Joan Sanchez 37f0b557f4 Removed callback
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-09-06 13:13:29 +02:00
Joan Sanchez 6410a4db42 Send response before ending task execution
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 12:54:33 +02:00
Joan Sanchez 011e372558 Removed wrong commit code pick
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 12:21:38 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Vicent Llopis 538c04e8c5 feat: db connection and query
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 11:59:03 +02:00
Vicent Llopis e5349ec7ed fix: send messages to channels
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 09:16:49 +02:00
Joan Sanchez e916915435 Updated to POST
gitea/salix/pipeline/head This commit looks good Details
2022-07-26 12:08:38 +02:00
Joan Sanchez f4825488c6 refactor(Tasks API): ghanged method to GET
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-07-26 11:47:43 +02:00
Alex Moreno 2b19688ca4 quit focus
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-07-21 13:16:30 +02:00
Vicent Llopis eccbd942f7 feat: can close a ticket
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-21 12:23:44 +02:00
Alex Moreno 9b48cbb078 feat(notification): send
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:54:50 +02:00
Alex Moreno 7895decf4e feat(notification): create models
gitea/salix/pipeline/head This commit is unstable Details
2022-07-19 15:17:22 +02:00
Vicent Llopis 1be0e9b7a9 feat: delete dms trash file
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 12:40:52 +02:00
Vicent Llopis 5eec01bdc3 feat: close tickets
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 11:20:08 +02:00
Joan Sanchez f7d64e89ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-22 08:59:06 +02:00
Joan Sanchez 004f1390fc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-06-22 08:58:51 +02:00
Carlos Jimenez Ruiz 0f44f072ee refactor(client): added updateUser and setPassword methods to client module 2022-06-16 11:32:42 +02:00
Juan Ferrer 86605c3d67 Merge branch 'dev' into 4164-edi_updateData
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 10:18:03 +00:00
Carlos Jimenez Ruiz cd5dba6fcb Merge branch 'dev' into 4040-chat_sendQueued
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 08:44:22 +00:00
Joan Sanchez 7fe7fb2e8f Replaced fs sync functions
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 10:13:45 +02:00
Vicent Llopis 93bb678738 updated endpoints description
gitea/salix/pipeline/head This commit looks good Details
2022-06-08 13:08:53 +02:00
Joan Sanchez 33e9dacf60 Merge branch 'dev' into 4164-edi_updateData
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-07 11:07:19 +00:00
Joan Sanchez f77f5cee58 4164 - Endpoint refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-07 13:06:42 +02:00
Joan Sanchez 70632ddc7c Clean
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-04 12:58:58 +02:00
Joan Sanchez 5918ddce3c Fix table cleaning
gitea/salix/pipeline/head This commit looks good Details
2022-06-04 12:45:02 +02:00
Joan Sanchez 0bb142a5d9 Removed rmdir
gitea/salix/pipeline/head This commit looks good Details
2022-06-04 12:25:05 +02:00
Joan Sanchez 13e0772f0b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 14:28:39 +02:00
Vicent Llopis e4b23fa14d fix: bugs
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 14:02:23 +02:00
Joan Sanchez 5059f72ea5 Clean directory
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 13:54:58 +02:00
Vicent Llopis e30817644a fix: bug
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 13:48:44 +02:00
Joan Sanchez bdb581db94 Disable file delete
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 13:47:40 +02:00
Vicent Llopis 9f57481390 refator: change comments
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 13:44:42 +02:00
Vicent Llopis fa27e6dd58 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 13:36:21 +02:00
Joan Sanchez 391960b390 Fixed sql table name
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 13:27:58 +02:00
Joan Sanchez 3752ca2347 Changed when file is removed
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 13:22:32 +02:00
Joan Sanchez 33049c507f Transaction fix
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 13:01:39 +02:00
Joan Sanchez b790ee88d9 Edi fixes
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 12:57:39 +02:00
Joan Sanchez 9bb264da38 Fixes
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 12:52:41 +02:00
Joan Sanchez d0e7ef8f47 Fixed SQL templates
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 12:44:39 +02:00
Joan Sanchez b1ce77d362 Debug logs
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 12:35:45 +02:00
Vicent Llopis 3eac002fb4 feat: add queue to send rocket messages
gitea/salix/pipeline/head This commit is unstable Details
2022-06-03 12:22:07 +02:00
Joan Sanchez b98ac4f233 Debugging logs
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 12:18:06 +02:00
Joan Sanchez f3eb36f8ee Edi fixes
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 11:47:43 +02:00
Vicent Llopis f6028316f4 feat: endpoint sendQueued addded
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 14:55:39 +02:00
Alex Moreno 9a25bdad06 relaunch tests
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 09:01:34 +02:00
Vicent Llopis 7de0fd6634 feat: create table chat
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 07:35:59 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +02:00
Alex Moreno 34bcdf1bd3 test(account): acl, connections and accounts secctions
gitea/salix/pipeline/head This commit looks good Details
2022-05-18 14:01:30 +02: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