Commit Graph

1187 Commits

Author SHA1 Message Date
Alex Moreno 65df9b87e7 fix: conflicts
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 13:22:53 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 09:16:30 +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
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
Vicent Llopis 15429293dd fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 11:34:13 +01:00
Vicent Llopis 76865fc7b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5084-monitor.index_tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 09:18:37 +01:00
Joan Sanchez 4477486f8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-02 08:58:44 +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
Alexandre Riera 2ef7b0d756 refs #5157 clip-path deleted
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:48:33 +01:00
Alex Moreno 2528b2d3ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:10:51 +01:00
Pau 136ad332b9 Merge branch 'dev' into 5148-logs-style
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:36:17 +00:00
Alex Moreno 4740cdbbb9 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:37:18 +01:00
Pau 8580851b5b refs #5148 @0:30h change style to pre-line
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 13:32:09 +01:00
Alex Moreno 4e65e88621 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 07:56:12 +01:00
Alex Moreno 788ebd4133 refactor(recover-password): recovery password label
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 07:50:37 +01:00
Vicent Llopis 67a64582e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:21:30 +01:00
Vicent Llopis 51400b1c74 reactor: eliminado try y catch, y añadido finally
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 08:19:52 +01:00
Alex Moreno eb59efbb85 refactor(front): use vn-loopback/boot/date
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 15:12:16 +01:00
Vicent Llopis 5a70fd4779 fix: las peticiones no colisionan
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 14:45:35 +01:00
Alexandre Riera 1e89352446 hotfix instanceLog css
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 14:37:08 +01:00
Alex Moreno 4a06b8e8a9 fix: import date.js and fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 15:16:42 +01:00
Vicent Llopis 9eb65507b5 fix: elimino this.model.refresh que siempre daba fallo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 14:43:31 +01:00
Alex Moreno fe656aa125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 14:10:20 +01:00
Vicent Llopis 5a19e5801f fix: enabled button when an error occurs
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 11:50:54 +01:00
Alex Moreno 6b6f27c2f2 fix: typo
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 08:44:58 +01:00
Alex Moreno bd0f4d89f8 Merge branch '5043-mock_Date' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 08:07:45 +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
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:30:30 +01:00
Vicent Llopis ef7a0508ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:29:42 +01:00
Alex Moreno 8d33aa8454 fix(fixtures): use static dates
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-17 15:36:39 +01:00
Alexandre Riera fea76f29e7 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 07:31:45 +00: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 6b1a6fe44b feat: mock dates front and back 2023-01-16 15:18:00 +01:00
Alex Moreno 2cc89d9ae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 13:54:16 +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
Pau b6de50848a refs #5081 fix sms faltas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:48:44 +01:00
Vicent Llopis 2451d00998 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 07:59:43 +00:00
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Alexandre Riera 9f1c6e6d1d Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 10:48:10 +00:00
Vicent Llopis eb3ed95b22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-10 08:32:44 +01:00
Alex Moreno 8688fc4652 Merge branch 'dev' into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 06:23:21 +00:00
Robert Ferrús bcefea726c Merge branch 'dev' into 4857-invoiceOutTranslate
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 13:54:01 +00:00
Robert Ferrús 6891da4863 refactor(invoiceOut): updated translation
gitea/salix/pipeline/head This commit looks good Details
Refs #4857
2023-01-05 11:43:08 +01:00
Vicent Llopis 3edc0403ba fix 2023-01-05 10:35:42 +01:00
Vicent Llopis 9ae7b92bbf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 09:00:37 +01:00
Alexandre Riera ac56744244 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:15:26 +00:00
Vicent Llopis fa58ac2462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:13:47 +01:00
Joan Sanchez 674fe49058 fix(icons): prevent icon translation when using google translator
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 5044
2023-01-03 08:41:58 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00