Commit Graph

14386 Commits

Author SHA1 Message Date
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
Joan Sanchez 92557ea22d Added version 10510
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:43:34 +01:00
Vicent Llopis dbbce77cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:41:43 +01:00
Joan Sanchez 4e7ef47b88 SQL fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:41:08 +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 9252fc896f Merge branch '#288-traducir-state-i18n' of https://gitea.verdnatura.es/verdnatura/salix into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 07:08:57 +01:00
Pau 724c1e6e8a remove unnecessary index 2022-11-25 07:08:54 +01:00
Pau 65f82c8fc1 Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 06:05:05 +00:00
Vicent Llopis 84c6604dd9 feat: enviar sms con cambios en el pedido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 15:04:15 +01:00
Vicent Llopis 82cc2b1208 Merge pull request 'DEV_fix_closeTicket' (!1173) from DEV_fix_closeTicket into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1173
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-24 13:29:42 +00:00
Pau 0b15236129 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 13:18:40 +00:00
Pau 7c71e40cc5 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 13:15:54 +00:00
Pau 15f14062ca Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 14:06:52 +01:00
Vicent Llopis e34fb3e4db Merge branch 'dev' into DEV_fix_closeTicket
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 12:59:29 +00:00
Joan Sanchez 0f40aa3e27 Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1175
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-11-24 12:49:53 +00:00
Vicent Llopis d233286a3f Merge branch 'dev' into DEV_fix_closeTicket
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 12:44:37 +00:00
Vicent Llopis 9517063853 Merge pull request 'fixes #4682-searchbar_filter' (!1164) from 4682-searchbar_filter into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1164
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-24 12:44:19 +00:00
Pau 001c3ec2ac requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 12:06:13 +01:00
Vicent Llopis 20d0d053ac Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 11:03:23 +00:00
Vicent Llopis 8e74ddf267 Merge pull request 'fixes #4793-models_translation' (!1148) from 4793-models_translation into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1148
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-24 11:03:08 +00:00
Vicent Llopis 74e8789439 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 10:54:40 +00:00
Pau 37a7a12f87 requested change
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 11:47:32 +01:00