dev #41

Merged
jjminguez merged 46 commits from dev into master 2026-04-16 15:34:49 +00:00

46 Commits

Author SHA1 Message Date
f68029edc1 Merge pull request 'fix: serializar dates/Decimal en LogService con DjangoJSONEncoder' (#40) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #40
2026-04-16 15:34:11 +00:00
aed8661331 Merge pull request 'fix: corregir ruta de data/ y hacer LogService resiliente a fallos de BD' (#38) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #38
2026-04-16 15:11:27 +00:00
3c7d47782b Merge pull request 'feat: añadir app general con LogService centralizado' (#36) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #36
2026-04-16 14:57:20 +00:00
e597a05f08 Merge pull request 'refactor: mover BD SQLite a carpeta data/' (#34) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #34
2026-04-16 14:36:39 +00:00
d444021a00 Merge pull request 'fix: corregir name en common/apps.py' (#32) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-16 14:12:59 +00:00
7a151a4768 Merge pull request 'refactor: reorganizar estructura app/api_config' (#30) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-16 14:02:01 +00:00
56e7d77d63 Merge pull request 'Merge pre-dev into dev' (#28) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
2026-04-16 13:51:17 +00:00
1e72aa3e44 Merge pull request 'Update 0001_initial.py' (#26) 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: #26
2026-04-14 23:17:11 +00:00
b08e74f459 Merge pull request 'fix' (#25) from pre-dev into dev
All checks were successful
DEPLOY_MULTI_BRACH/pipeline/head This commit looks good
Reviewed-on: #25
2026-04-14 23:02:44 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
9b447a21ce Merge pull request 'Update README.md' (#26) from pre-dev into dev
Reviewed-on: #26
2026-04-11 22:49:00 +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
f77f05e105 Merge pull request 'Update README.md' (#24) from pre-dev into dev
Reviewed-on: #24
2026-04-11 22:08:43 +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
7b0fcf26ff Merge pull request 'creacion de modelos' (#21) from pre-dev into dev
Reviewed-on: #21
2026-04-11 19:36:09 +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
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
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
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
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
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
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
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
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
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
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
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
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