Commit Graph

159 Commits

Author SHA1 Message Date
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
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
c4e8675fe8 Merge pull request 'dev' (#23) from dev into master
Reviewed-on: #23
2026-04-11 20:48:19 +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
04fb83447f Merge pull request 'dev' (#16) from dev into master
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/16
2026-04-11 18:39:48 +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
bdda074fa1 Merge pull request 'dev' (#14) from dev into master
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/14
2026-04-11 18:23:51 +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
juanjo
97017df547 Update Jenkinsfile 2026-04-11 18:10:25 +02:00
64afc3aedb Merge pull request 'dev' (#11) from dev into master
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/11
2026-04-11 18:04:09 +02:00
289bd6f510 Merge pull request 'pre-dev' (#10) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/10
2026-04-11 17:01:20 +02:00
juanjo
ae00212f36 Update README.md 2026-04-11 16:52:55 +02:00
juanjo
5598d843a0 Update Jenkinsfile 2026-04-11 16:45:46 +02:00
156e1aa27c Merge pull request 'dev' (#9) from dev into master
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/9
2026-04-11 15:21:01 +02:00
2d528b1e4d Merge pull request 'Update Jenkinsfile' (#8) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/8
2026-04-11 15:20:39 +02:00
juanjo
947823a22d Update Jenkinsfile 2026-04-11 15:19:48 +02:00
16b7f956b3 Merge pull request 'dev' (#7) from dev into master
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/7
2026-04-11 15:13:03 +02:00
29af52add4 Merge pull request 'Update Jenkinsfile' (#6) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/6
2026-04-11 15:11:57 +02:00
juanjo
cc64ad9cf6 Update Jenkinsfile 2026-04-11 15:09:38 +02:00
34faf2157e Merge pull request 'dev' (#5) from dev into master
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/5
2026-04-11 15:07:07 +02:00
069a29bc27 Merge pull request 'Update Jenkinsfile' (#4) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/4
2026-04-11 15:05:48 +02:00
juanjo
506df66118 Update Jenkinsfile 2026-04-11 15:03:38 +02:00
2a6723aedf Merge pull request 'dev' (#3) from dev into master
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/3
2026-04-11 14:57:47 +02:00
03edd2c544 Merge pull request 'fix deployments' (#2) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/2
2026-04-11 14:54:45 +02:00
juanjo
533f76f68a fix deployments 2026-04-11 14:53:34 +02:00
15050ae93d Merge pull request 'pre-dev' (#1) from pre-dev into dev
Reviewed-on: https://gitea.185.187.169.109.nip.io/Proyecto-SaaS/django-core-base/pulls/1
2026-04-11 14:44:29 +02:00
juanjo
fe56843a98 Update README.md 2026-04-11 14:41:03 +02:00