Commit Graph

682 Commits

Author SHA1 Message Date
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
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 a425d54bf6 add back test
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 12:16:47 +01:00
Pau 10c70f5388 Merge branch '4797-lilium-worker-notifications' of https://gitea.verdnatura.es/verdnatura/salix into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 09:06:18 +01:00
Pau a5f83021db requested changes 2023-01-18 09:06:17 +01:00
Pau ec4c628adf Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 06:43:45 +00:00
Pau cc806cc08f requested changes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-01-18 07:41:10 +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
Pau 3b69d76525 fix error preventing subscriptions
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 08:43:11 +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 24b8b172b9 use notification id 2023-01-05 14:13:42 +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
Pau 1653439c44 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:33:21 +00: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 a55d007655 requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:12:46 +01:00
Pau 0a602892e6 changed let to const and removed duplicate code
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 14:59:23 +01:00
Pau ee0cd2174f requested changes refs #4797 @2h
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 14:32:19 +01:00
Pau c9468990b7 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-27 10:08:39 +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
Joan Sanchez 6b94922335 Fixes
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 12:12:48 +01:00
Vicent Llopis bd91d4a649 fix: añadida transacción 2022-11-25 11:50:24 +01:00
Joan Sanchez 6af7da4793 Updated regex
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 11:13:26 +01:00
Joan Sanchez 7ea4d9c2e1 fix(rocketchat): Regex fix
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 09:18:21 +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
Joan Sanchez 866ee4d565 fix(rocketchat): Replace invalid link characters
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 08:36:29 +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
Pau dfdf3d68bf changes needed for the worker Notification manager to work
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:36:05 +01: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 314e98b838 fix: nested router
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:57:52 +01:00
Alex Moreno 660648e01f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-22 14:35:25 +01:00
Pau 2567a1fab3 refs #4732 @4h30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:31:55 +01:00