Commit Graph

73 Commits

Author SHA1 Message Date
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
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
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
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
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
0af35ee5db Merge pull request 'subimos predev cambios' (#25) from pre-dev into dev
Reviewed-on: #25
2026-04-11 22:20:59 +02:00
minguezsanzjuanjose
5287863c91 subimos predev cambios 2026-04-11 22:20:06 +02:00
f77f05e105 Merge pull request 'Update README.md' (#24) from pre-dev into dev
Reviewed-on: #24
2026-04-11 22:08:43 +02:00
minguezsanzjuanjose
508bc41b1c Update README.md 2026-04-11 22:07:53 +02:00
3fecd8c7fb Merge pull request 'actions y ip allowed en settings' (#22) from pre-dev into dev
Reviewed-on: #22
2026-04-11 19:42:37 +02:00
minguezsanzjuanjose
199c0be297 actions y ip allowed en settings 2026-04-11 19:41:58 +02:00
7b0fcf26ff Merge pull request 'creacion de modelos' (#21) from pre-dev into dev
Reviewed-on: #21
2026-04-11 19:36:09 +02:00
minguezsanzjuanjose
ef42701a92 creacion de modelos 2026-04-11 19:35:26 +02:00
f5f53d03c9 Merge pull request 'Update settings.py' (#20) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/20
2026-04-11 19:12:30 +02:00
juanjo
f003137cd8 Update settings.py 2026-04-11 19:11:54 +02:00
e304a5c35f Merge pull request 'fix 2' (#19) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/19
2026-04-11 19:08:00 +02:00
juanjo
7e1755ded0 fix 2 2026-04-11 19:07:22 +02:00
93164e4f2c Merge pull request 'Update docker-compose.yml' (#18) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/18
2026-04-11 18:57:11 +02:00
juanjo
781bb216a3 Update docker-compose.yml 2026-04-11 18:56:35 +02:00
ce7a1414a2 Merge pull request 'Update docker-compose.yml' (#17) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/17
2026-04-11 18:46:54 +02:00
juanjo
85246b6bbd Update docker-compose.yml 2026-04-11 18:46:15 +02:00
52f11e7174 Merge pull request 'Update docker-compose.yml' (#15) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/15
2026-04-11 18:36:19 +02:00
juanjo
cc358deff6 Update docker-compose.yml 2026-04-11 18:34:50 +02:00
6f2c383db4 Merge pull request 'Update Jenkinsfile' (#13) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/13
2026-04-11 18:20:35 +02:00
juanjo
9d3fc27e70 Update Jenkinsfile 2026-04-11 18:18:43 +02:00
8b3a1b032f Merge pull request 'Update Jenkinsfile' (#12) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/12
2026-04-11 18:13:30 +02:00