Commit Graph

102 Commits

Author SHA1 Message Date
0ac0a859b9 Merge pull request 'dev' (#24) from dev into master
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #24
2026-04-14 21:52:57 +00:00
02aca6a2a6 Merge pull request 'Update Jenkinsfile' (#23) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
DEPLOY_MULTI_BRACH/pipeline/pr-master This commit looks good
Reviewed-on: #23
2026-04-14 21:48:28 +00:00
minguezsanzjuanjose
4a4d0940b3 Update Jenkinsfile
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 23:47:24 +02:00
7a9a1686fa Merge pull request 'dev' (#21) from dev into master
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #21
2026-04-14 21:28:08 +00:00
b4ab653c95 Merge pull request 'Update settings.py' (#22) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/pr-master This commit looks good
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #22
2026-04-14 21:25:16 +00:00
minguezsanzjuanjose
c32092d216 Update settings.py
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 23:24:27 +02:00
049764b79c Merge pull request 'Delete 0002_alter_log_options.py' (#20) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/pr-master This commit looks good
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #20
2026-04-14 21:03:22 +00:00
minguezsanzjuanjose
7ba79c9739 Delete 0002_alter_log_options.py
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 23:02:45 +02:00
c60c140a97 Merge pull request 'cambios en migraciones' (#19) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #19
2026-04-14 20:46:59 +00:00
minguezsanzjuanjose
bf5a38d425 cambios en migraciones
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 22:46:18 +02:00
f610eb24d4 Merge pull request 'feat: integración final de Jenkins con inyección de .env segura' (#18) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #18
2026-04-14 19:31:55 +00:00
minguezsanzjuanjose
039349b5b1 feat: integración final de Jenkins con inyección de .env segura
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 21:30:19 +02:00
816cc276f8 Merge pull request 'fix' (#17) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #17
2026-04-13 23:01:41 +00:00
minguezsanzjuanjose
9dd97b34f2 fix
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-14 01:00:37 +02:00
5a7209badb Merge pull request 'dev' (#16) from dev into master
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #16
2026-04-12 20:57:46 +00:00
d39e078fb6 Merge pull request 'fix admin status' (#15) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #15
2026-04-12 20:56:59 +00:00
juanjo
3da81a9495 fix admin status
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 22:56:35 +02:00
ac1c024bee Merge pull request 'endpoint de status' (#14) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #14
2026-04-12 20:39:31 +00:00
juanjo
e5908b1880 endpoint de status
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 22:38:49 +02:00
147a1d49cc Merge pull request 'pre-dev' (#13) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #13
2026-04-12 20:15:16 +00:00
juanjo
1bf3337616 Update .gitignore
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 22:12:35 +02:00
juanjo
6fb3afa472 fix para ficheros que no se suben
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 22:11:51 +02:00
8579af3f21 Merge pull request 'fix' (#12) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #12
2026-04-12 14:04:06 +00:00
minguezsanzjuanjose
102d7c6bfa fix
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 16:02:58 +02:00
32e3184b59 Merge pull request 'dev' (#11) from dev into master
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #11
2026-04-12 13:42:46 +00:00
5e04933708 Merge pull request 'ignore' (#10) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #10
2026-04-12 13:40:45 +00:00
minguezsanzjuanjose
ac6e336772 ignore
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 15:38:01 +02:00
083375c5f0 Merge pull request 'dev' (#9) from dev into master
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #9
2026-04-12 12:10:27 +00:00
d9bba25437 Merge pull request 'Update Jenkinsfile' (#8) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #8
2026-04-12 12:09:27 +00:00
minguezsanzjuanjose
e486a0f556 Update Jenkinsfile
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 14:08:36 +02:00
6f84db00cd Merge pull request 'dev' (#7) from dev into master
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #7
2026-04-12 02:53:09 +00:00
b37b581a78 Merge pull request 'pre-dev' (#6) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/pr-master Build queued...
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #6
2026-04-12 02:52:00 +00:00
minguezsanzjuanjose
0971134702 Update docker-compose.yml
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:51:32 +02:00
minguezsanzjuanjose
02bc67c5fd Update docker-compose.yml
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:49:56 +02:00
c54e1e9b9e Merge pull request 'Update .env' (#5) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #5
2026-04-12 02:46:57 +00:00
minguezsanzjuanjose
02feaf445d Update .env
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:46:31 +02:00
15f2a21a2c Merge pull request 'fix' (#4) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #4
2026-04-12 02:43:35 +00:00
minguezsanzjuanjose
c8aa23b564 fix
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:43:02 +02:00
264c66c7c0 Merge pull request 'Update docker-compose.yml' (#3) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #3
2026-04-12 02:39:57 +00:00
minguezsanzjuanjose
0ce0554443 Update docker-compose.yml
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:39:31 +02:00
16cbd85e7f Merge pull request 'fix' (#2) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #2
2026-04-12 02:37:26 +00:00
minguezsanzjuanjose
375291514e fix
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:36:59 +02:00
14e2036bd0 Merge pull request 'pre-dev' (#1) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #1
2026-04-12 02:25:14 +00:00
minguezsanzjuanjose
c9c54e6671 Update Jenkinsfile
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-12 04:20:03 +02:00
minguezsanzjuanjose
9804712643 Update README.md
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-11 23:18:34 +02:00
b60ecccad4 Merge pull request 'dev' (#28) from dev into master
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #28
2026-04-11 23:02:30 +02:00
1752b88bc3 Merge pull request 'Update README.md' (#27) from pre-dev into dev
Some checks failed
DEPLOY_MULTI_BRACH/pipeline/head There was a failure building this commit
Reviewed-on: #27
2026-04-11 23:01:24 +02:00
minguezsanzjuanjose
603df88419 Update README.md 2026-04-11 23:00:37 +02:00
9b447a21ce Merge pull request 'Update README.md' (#26) from pre-dev into dev
Reviewed-on: #26
2026-04-11 22:49:00 +02:00
minguezsanzjuanjose
8ca0abc273 Update README.md 2026-04-11 22:48:23 +02:00