Commit Graph

854 Commits

Author SHA1 Message Date
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 f37974c835 Merge branch 'dev' into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 12:39:27 +00: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
Alex Moreno 5a6a18c76a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 09:20:54 +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 75bb0f8160 refs #5860 fix hash smbhash
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 12:19:59 +02:00
Alex Moreno cf01c8d46e refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 09:35:20 +02:00
Alex Moreno b96f0f22b5 refs #5475 feat(account_changePassword)
gitea/salix/pipeline/head There was a failure building this commit Details
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
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
Vicent Llopis 0aae1732bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-12 15:20:46 +02:00
Alex Moreno 1c39ad873c resolve dev conflicts
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 11:06:45 +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
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
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
Alex Moreno cb50c617ee refs #5489 deprecate account.user.password
gitea/salix/pipeline/head There was a failure building this commit Details
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
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
Alex Moreno 86cd5f5237 refs #5472 fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-02 15:07:02 +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 9462ca90a7 refs #5472 refactor setPassword & changePassword, fix sync
gitea/salix/pipeline/head There was a failure building this commit Details
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
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
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
gitea/salix/pipeline/head Build queued... Details
2023-05-30 10:07:17 +02:00
Vicent Llopis ea1c860a18 refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta
gitea/salix/pipeline/head This commit looks good Details
2023-05-30 09:13:47 +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 c35e2e155f refs #5472 test(changePassword): back
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 15:12:28 +02:00
Vicent Llopis cd244daf84 refs #5468 feat: checkbox 'activo' marcado por defecto
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 10:04:31 +02:00
Vicent Llopis aea39dd0b7 refs #5468 feat: modificalos acl de VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
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 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
Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1546
2023-05-22 17:04:32 +00:00
Alex Moreno 3189799b4c correct type
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 14:45:00 +02:00
Alexandre Riera e589e70e06 Merge branch 'dev' into 5655-afinar-login
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 10:31:27 +00: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 bbc34f04ff 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-05-19 07:35:23 +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
Alex Moreno 6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 11:43:25 +00:00
Juan Ferrer 30d6f56c39 refs #5667 Style fixes, model translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:06:14 +02:00
Alex Moreno 9f0d5097fe refs #5160 increase jasmine timeout
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 09:14:38 +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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 07:46:10 +00:00
Vicent Llopis 3f26072787 refs #5468 eliminados getters a VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 09:02:55 +02:00
Javi Gallego 8a843b37bd refs #5160 Back test timeout workaround
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 13:54:42 +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
Vicent Llopis 62dd64eb89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 11:56:50 +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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 10:55:16 +02:00
Alex Moreno 728ef965c4 refs #5472 feat(out_login): change-password
gitea/salix/pipeline/head There was a failure building this commit Details
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
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-04 15:01:29 +02:00