Commit Graph

13935 Commits

Author SHA1 Message Date
Carlos Andrés df6f836b59 Merge pull request '#4613 eliminar uso de portfolio' (!1178) from 4613-Eliminar-cálculo-portfolio into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1178
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2022-11-28 12:42:25 +00:00
Carlos Andrés 2a4e8cdde9 Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 12:19:58 +00:00
Alex Moreno f9c311804a Merge pull request '4077-login_recover-password & account_verifyEmail' (!1063) from 4077-login_recover-password into dev
gitea/salix/pipeline/head This commit looks good Details
fixes #4077
2022-11-28 11:34:01 +00:00
Alex Moreno d9e4ff6772 fix: use $location
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 11:48:25 +01:00
Carlos Andrés 6b76804913 refs #4865 Sintaxis mensajes rocket
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 10:52:15 +01:00
Pau 6675095b45 Merge branch 'dev' into 4871-socialName-on-client-filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 09:52:10 +00:00
Pau aa100891cd refs #4871 @1h test passed
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 10:47:32 +01:00
Pau 0d6e424a3e allow client search by socialname 2022-11-28 10:21:01 +01:00
Alex Moreno e49cbbaa80 Merge branch '4613-Eliminar-cálculo-portfolio' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 10:14:35 +01:00
Alex Moreno da2d1df522 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio 2022-11-28 10:14:16 +01:00
Carlos Andrés bc83b9fd1f Merge branch '4613-Eliminar-cálculo-portfolio' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 10:07:21 +01:00
Carlos Andrés 2b0e6ab5ed test 2022-11-28 10:07:18 +01:00
Alex Moreno e4bbb6e83a Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 08:43:55 +00:00
Joan Sanchez 7121dcb25c Merge pull request 'MASTER_-fix_sendMail' (!1176) from MASTER_-fix_sendMail into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1176
2022-11-28 08:06:17 +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
Alex Moreno 6db1a9e8ae refs #4859 fix: fixtures db exportation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 07:19:30 +01:00
Alex Moreno f5f17311df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db 2022-11-25 14:14:15 +01:00
Vicent Llopis 1493b8260f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 13:33:20 +01:00
Alexandre Riera 249373972b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 12:56:37 +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
Alexandre Riera 1a9e6d95ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 12:46:50 +01:00
Joan Sanchez ba4ea83360 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-11-25 12:44:35 +01:00
Joan Sanchez 2eabe38277 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 12:44:23 +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 7f3265be55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2022-11-25 12:24:00 +01:00
Vicent Llopis 5415338f55 refactor: movidos changes sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 12:17:16 +01:00
Vicent Llopis 4ef2e3dfcd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-11-25 12:16:40 +01:00
Vicent Llopis d15e2551a2 feat: add frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 12:16:01 +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 af87fc2d53 fix: modelo incorrecto
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 11:51:07 +01:00
Vicent Llopis bca79e1240 feat: add backTest 2022-11-25 11:50:54 +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
Alexandre Riera 9f10129152 sql moved to 10510
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 10:27:45 +01:00
Alexandre Riera 2f82619ea5 Merge branch '3963-ticket-advance' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 10:25:56 +01:00
Alexandre Riera 8fec0670ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-25 10:25:46 +01:00
Pau 526bd5851b Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:21:20 +00:00
Pau 8f98082910 refs #4791 @2h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:59:02 +01:00
Joan Sanchez c4643c3a01 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-11-25 09:46:43 +01:00
Joan Sanchez 5bde9da6b6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 09:46:12 +01:00
Vicent Llopis e540bf7b31 feat: inserta en la nueva tabla ticketSms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:38:34 +01:00
Carlos Andrés 8d2e532167 #4613 eliminar uso de portfolio
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:32:54 +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
Alex Moreno c9347a929a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db 2022-11-25 08:52:11 +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
Vicent Llopis d023ec0a13 update fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 08:24:25 +01:00
Pau 1c9964b902 Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 08:23:59 +01:00
Pau d47e7ffb16 change component location 2022-11-25 08:23:57 +01:00