Commit Graph

765 Commits

Author SHA1 Message Date
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 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
Alex Moreno a22a8a6bd8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-05-04 11:34:19 +02:00
Alexandre Riera a2d3b79246 Merge branch 'dev' into 4713-saleTracking
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 06:42:39 +00:00
Alex Moreno 5eca583c62 refs #5472 feat(vnUser): override setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 15:19: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 48be8b9fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-05-02 11:27:14 +02:00
Alex Moreno c3038a4d61 fix(imageCollection):
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 11:54:11 +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
Vicent Llopis 87ffd2668e refs #5468 scope para VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 15:06:05 +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
Vicent Llopis 37a7d02006 quitado scope
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:18:32 +02:00
Vicent Llopis 74d543884e refs #5468 añadido scope al modelo VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 11:55:01 +02:00
Juan Ferrer 081b4af6d6 Merge branch 'dev' into 5517-improveLogs+translations 2023-04-24 10:44:42 +02:00
Alex Moreno 294bf2b8a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-21 13:30:34 +02:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Juan Ferrer 6f1744baff Merge branch 'dev' into 5517-improveLogs+translations 2023-04-20 16:30:24 +02:00
Alex Moreno c1d4281b1b refs #5488 replace hasWriteRole, hasReadRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:59:26 +02:00
Joan Sanchez 32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 11:41:55 +02:00
Alexandre Riera 7d8a0597c1 Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:53:36 +00:00
Alexandre Riera 2675c02d13 refs #5518 moved models to account
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 11:52:52 +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
Juan Ferrer ca3a1be20f refs #4480 md5 removed from VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-15 01:52:22 +02:00
Juan Ferrer 2af48b3049 refs #4480 Fix: VnUser before save hook removed -> setting password attribute 2023-04-15 01:51:38 +02:00
Alexandre Riera ad3836552e refs #5518 sections added
gitea/salix/pipeline/head This commit looks good Details
2023-04-14 14:16:29 +02:00
Joan Sanchez 6e7b452792 Max quality
gitea/salix/pipeline/head This commit looks good Details
2023-04-14 13:19:17 +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
Vicent Llopis 2a2d03e05a refs #5517 añadidas traducciones de algunos modelos
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 15:02:21 +02:00
Joan Sanchez b49307463e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 13:53:25 +02:00
Joan Sanchez e8f0a49f0c fix(resetPassword): increased token TTL for password recovery
gitea/salix/pipeline/head This commit looks good Details
Refs #5474
2023-04-04 13:51:44 +02:00
Joan Sanchez f4ff869c4d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
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
Vicent Llopis c46d325e23 fix: add transaction
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 07:58:39 +01:00
Alexandre Riera 423ae85212 refs #4632 dmsRecover deprecated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:29:09 +01:00
Alexandre Riera 06dd72f30c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix 2023-03-08 12:13:48 +01:00
Alexandre Riera 106f96b9a6 refs #4713 fixed front test
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 5ccfe6bf90 refs #5160 callback added
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 11:19:41 +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 0d16f71fd3 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-02-21 14:10:36 +01:00
Joan Sanchez 71167ffa1f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 14:02:25 +01:00
Joan Sanchez 49c2ec7f9a fix(image): Enabled failOn option
gitea/salix/pipeline/head This commit looks good Details
Refs: #5266
2023-02-21 14:01:12 +01:00
Joan Sanchez 0393d9cb6a Removed commented block code
gitea/salix/pipeline/head This commit looks good Details
2023-02-20 14:17:18 +01:00
Joan Sanchez 90e1136ee2 fix(image): store images with a name generated through uuid instead of url path
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
Vicent Llopis cec7602e1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-07 13:44:53 +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
Vicent Llopis ba5616055b feat: item.descriptor en summary coge el warehouse por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 14:31:50 +01:00
Alex Moreno 575784c870 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-03 10:03:59 +01:00
Alex Moreno e16c16c194 Merge branch 'dev' into 5170-recover-password_use_user
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 08:12:54 +00:00
Vicent Llopis 508bce73bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 08:41:35 +01:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Joan Sanchez eded1ebf20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 11:42:48 +01:00
Joan Sanchez 644d98ec1c syncUser() and setPassword() changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 07:32:38 +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
Vicent Llopis caf1dcd690 feat: añadido almacén por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:19:33 +01:00
Joan Sanchez 12cf79ab39 Updated e2e 2023-01-25 14:14:55 +01:00
Alex Moreno d77730dd47 fix: mockedDate in e2e
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
Pau a2150b8b08 change test to adhere to the fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 10:15:32 +01:00
Pau c13bffcc57 refs #4797 @1h requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 10:11:16 +01:00
Joan Sanchez 89eb065f6d Updated models 2023-01-24 09:04:43 +01:00
Pau dfa3022949 Merge branch 'dev' into 4797-lilium-worker-notifications 2023-01-24 08:20:45 +01:00