Commit Graph

1490 Commits

Author SHA1 Message Date
Alex Moreno 63f062a069 fix(renewToken): refs #8093 test & fix(sql) addClientObservationType
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-15 08:19:35 +02:00
Alex Moreno 5b938a6f78 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-15 08:00:39 +02:00
Sergio De la torre d164cccee5 fix: refs #6861 assignCollection
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-07 16:14:16 +02:00
Jorge Penadés 23d2d2b1ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-03 15:39:37 +02:00
Alex Moreno 61f806b0c9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-30 14:40:35 +02:00
Pablo Natek f858674c8a Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev"
gitea/salix/pipeline/pr-test This commit looks good Details
This reverts commit f6c5f41d44, reversing
changes made to 5ee5da24e1.
2024-09-27 12:01:54 +02:00
Javi Gallego 9ef44d8d8d feat: refs #6722 refactor createThermograph 2024-09-25 13:23:31 +02:00
Jorge Penadés 1c42303a75 chore: refs #7207 drop useless relation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-25 09:18:10 +02:00
Jorge Penadés 6ff76fd74b feat: refs #7207 show queue in worker summary
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-23 14:40:38 +02:00
Guillermo Bonet 28c38d09fd Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-19 16:41:08 +02:00
Guillermo Bonet e40e3ebed6 fix: refs #7882 Quadmind api config
gitea/salix/pipeline/head This commit looks good Details
2024-09-19 16:40:33 +02:00
Alex Moreno ccb60eee87 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-19 12:42:12 +02:00
Alex Moreno 79d79f0c9b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7792-twoFactorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-18 12:03:52 +02:00
Alex Moreno e523b12536 fix: refs #7792 enable null
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-18 09:50:55 +02:00
Alex Moreno 829ecba2ef refactor: refs #7792 revert TwoFactorType
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-18 08:30:05 +02:00
Guillermo Bonet 871d5457d0 refactor: refs #7882 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-18 07:14:52 +02:00
Javier Segarra 96159224a4 Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-17 16:48:09 +02:00
Javi Gallego 06d06d7b1a Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2970
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-17 13:09:18 +00:00
Javi Gallego e4a74ba0e9 feat: refs #3505 testBack closure 2024-09-16 13:24:33 +02:00
Pablo Natek 8f4f2d2d15 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-16 09:06:04 +02:00
Guillermo Bonet 9d9e0996f6 Merge branch 'dev' into 7882-quadMinds
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 08:12:15 +02:00
Guillermo Bonet ef4ea588ca feat: refs #7882 Added volume and timeWindow
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-10 07:43:11 +02:00
Javier Segarra 03d4427bcd Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 12:16:15 +00:00
Alex Moreno 0949112b13 Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 12:42:13 +02:00
Alex Moreno 71eb44d083 refactor(vnUser): refs #7792 use twoFactorFk and add foreignKey
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-09 09:58:20 +02:00
Javier Segarra 59cce5d349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices 2024-09-08 12:31:39 +02:00
Pablo Natek e20ef7c699 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-03 07:50:41 +02:00
Guillermo Bonet b40ecf9e19 feat: refs #7882 Improved sendOrders and added more config params
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-02 11:48:32 +02:00
Javi Gallego e2f1fea6be fix: refs #7277 error test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-30 17:04:45 +02:00
Guillermo Bonet 8165830934 feat: refs #7882 Now supports coords, address and long address
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-30 12:30:40 +02:00
Guillermo Bonet a25e619036 fix: refs #7882 Added send orders method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-29 14:48:21 +02:00
Guillermo Bonet e4477ca109 fix: refs #7882 Stable version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-29 13:21:59 +02:00
Guillermo Bonet 4d820f1003 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-27 10:08:04 +02:00
Guillermo Bonet 2dc095e828 fix: refs #7811 Renew token crash
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-27 10:07:09 +02:00
Guillermo Bonet d2a61cf18d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-27 07:24:38 +02:00
Guillermo Bonet 83f3a05721 fix: refs #7811 Tests
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-27 07:24:10 +02:00
Guillermo Bonet e9870be76f Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-08-26 12:14:38 +02:00
Guillermo Bonet b6c0ff01bf fix: refs #7811 Renew token crash
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-26 12:04:03 +02:00
Guillermo Bonet 0610cbc32e feat: refs #7882 Added model and method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 13:12:11 +02:00
Jorge Penadés 2aaad4316b Merge branch 'dev' into 7524-limitSelect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-16 06:54:35 +00:00
Guillermo Bonet 8d35e95731 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-14 12:48:52 +02:00
Guillermo Bonet 5e0bf4c739 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-08-14 12:48:22 +02:00
Guillermo Bonet b268bf5eb7 feat: refs #7811 Added autorestart param pm2
gitea/salix/pipeline/head This commit looks good Details
2024-08-14 12:47:44 +02:00
Alex Moreno ef1b4ef0a4 feat(update-user): refs #7848 add twoFactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 12:30:37 +02:00
Alex Moreno 22ee4f1853 refactor: refs #7848 adapt to lilium 2024-08-13 12:30:12 +02:00
Jorge Penadés 3adb73cddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 15:38:40 +02:00
Alex Moreno dd6aa6b1dd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-08 11:52:06 +02:00
Alex Moreno c8f1b7c5ff hotFix(validateCode): username comparation
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-08 11:51:46 +02:00
Sergio De la torre 09d93caddb Merge pull request 'refs #6078 - workerAct' (!2814) from 6078_workerAct into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2814
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-08 08:26:11 +00:00
Alex Moreno 17d05ecfe2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-08 10:07:26 +02:00