 Jorge Penadés
|
b88d61e864
|
Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl
|
2023-12-07 14:53:33 +01:00 |
|
Jorge Penadés
|
6fb4e86777
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD
|
2023-12-07 14:47:31 +01:00 |
|
Jorge Penadés
|
968dc65231
|
refs #6274 tests created
|
2023-12-07 14:47:22 +01:00 |
 Carlos Satorres
|
7e9134ecc3
|
refs #5971 change sql address
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 13:47:07 +01:00 |
 Sergio De la torre
|
9937fbed5e
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 11:59:01 +01:00 |
|
Sergio De la torre
|
67994188ee
|
Merge branch 'dev' into 6028_routesByWorkerEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 10:42:30 +00:00 |
|
Sergio De la torre
|
fa65cc84a9
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-07 11:39:22 +01:00 |
|
Sergio De la torre
|
61ed53bd1d
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 10:37:06 +01:00 |
|
Carlos Satorres
|
920b38c929
|
refs #5525 move sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 09:49:15 +01:00 |
|
Carlos Satorres
|
f5ef6c66a4
|
Merge pull request 'refs #6010 remove pending' (!1876) from 6010-testBackPending into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1876
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-07 08:41:03 +00:00 |
 Javier Segarra
|
d37083b3a4
|
Merge pull request 'Merge dev - test' (!1881) from dev into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1881
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-07 08:28:24 +00:00 |
|
Jorge Penadés
|
76659344fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 08:30:35 +01:00 |
|
Carlos Satorres
|
3abbae7612
|
Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 07:16:17 +00:00 |
 Javi Gallego
|
be5df940bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 08:01:20 +01:00 |
|
Javi Gallego
|
58ba1c10d0
|
ci: dev-test
|
2023-12-07 08:01:16 +01:00 |
|
Sergio De la torre
|
0263d880ca
|
refs #6028 add:email in ByWorker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 08:00:17 +01:00 |
|
Carlos Satorres
|
3c9c221220
|
Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-07 06:59:38 +00:00 |
|
Carlos Satorres
|
c75ee22345
|
Merge pull request 'refs #6318 quantity' (!1875) from 6318-negativeQuantity into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1875
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-07 06:59:24 +00:00 |
|
Sergio De la torre
|
c9bcd672c9
|
refs #6028 add:email in ByWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-07 07:59:21 +01:00 |
|
Carlos Satorres
|
102ea1ee65
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 07:35:18 +01:00 |
|
Carlos Satorres
|
c7d960229d
|
Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 06:34:32 +00:00 |
|
Carlos Satorres
|
acfa0fd857
|
Merge branch 'dev' into 6318-negativeQuantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 06:31:21 +00:00 |
|
Javi Gallego
|
7ff8ec93ff
|
Merge pull request 'test' (!1879) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1879
|
2023-12-06 07:54:13 +00:00 |
|
Jorge Penadés
|
b50a6add0d
|
refs #6274 merge renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 15:57:42 +01:00 |
|
Jorge Penadés
|
bb186bafe0
|
Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
|
2023-12-05 14:12:00 +01:00 |
|
Javier Segarra
|
a5fb07bf12
|
refs #6264 perf remove unnecessary code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 13:05:26 +01:00 |
|
Javier Segarra
|
a7c48b6ddc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 13:02:34 +01:00 |
|
Javier Segarra
|
035b31d878
|
refs #5666 test: fix e2e tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 12:00:31 +01:00 |
|
Jorge Penadés
|
25006a938b
|
refs #6274 refactor clockIn
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 11:53:27 +01:00 |
|
Carlos Satorres
|
f55e85a189
|
refs #6010 remove pending
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 10:35:48 +01:00 |
|
Jorge Penadés
|
419ab41816
|
refs #6276 Acl addTimeEntry
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 09:55:22 +01:00 |
|
Carlos Satorres
|
af07a531ed
|
refs #6318 quantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:49:55 +01:00 |
|
Sergio De la torre
|
3692021b12
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 07:26:22 +00:00 |
|
Sergio De la torre
|
318f7e3c0d
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:20:55 +01:00 |
|
Javier Segarra
|
7a63e527a5
|
refs #5666 perf: remove comments
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 07:50:52 +01:00 |
|
Javier Segarra
|
6f32a588bb
|
refs #5666 feat: add role relation to RoleMapping
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 07:49:10 +01:00 |
|
Javier Segarra
|
1d92bbf4a2
|
refs #5666 feat: replace base value and add mixins
|
2023-12-05 07:48:56 +01:00 |
|
Javier Segarra
|
b4f4714c0a
|
refs #5666 feat: remove loggable.json
|
2023-12-05 07:47:38 +01:00 |
|
Javier Segarra
|
57add7abf0
|
refs #5666 perf: replace Role by VnRole
|
2023-12-05 07:16:12 +01:00 |
|
Javier Segarra
|
2fe631f078
|
refs #5666 feat: change models permissions
|
2023-12-05 07:15:22 +01:00 |
|
Jorge Penadés
|
8cb97e2477
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-04 15:09:44 +01:00 |
|
Javier Segarra
|
a8b0a7a5b3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-04 14:46:21 +01:00 |
|
Javier Segarra
|
5656ed7a2b
|
refs #6264 perf: use functions extracted previously
|
2023-12-04 14:46:05 +01:00 |
|
Javier Segarra
|
b9671c0b67
|
refs #6264 perf: remove files related to token
|
2023-12-04 14:44:50 +01:00 |
|
Carlos Satorres
|
62b2e23620
|
Merge branch 'dev' into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-04 09:01:45 +00:00 |
|
Carlos Satorres
|
051c93a42c
|
remove fdescribe
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-04 09:41:24 +01:00 |
|
Carlos Satorres
|
c0ce7e542f
|
refs #6085 solve testback
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-04 09:40:57 +01:00 |
|
Carlos Satorres
|
6d486fbec9
|
refs #6085 trad, remove front, back test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 13:58:45 +01:00 |
 Pablo Natek
|
303b6f5240
|
fix(expencefk): refs #6398 expenceFk to expenseFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-01 13:48:56 +01:00 |
|
Pablo Natek
|
bec1ff71ef
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
|
2023-12-01 13:43:27 +01:00 |