119 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
juanjo	4425141cb3	Merge dev: refactor mover BD SQLite a carpeta data/	2026-04-16 16:34:16 +02:00
juanjo	29db0eb0a2	Merge pre-dev: refactor mover BD SQLite a carpeta data/	2026-04-16 16:34:00 +02:00
juanjo	91fc6900eb	refactor: mover BD SQLite a carpeta data/ ... - Mover db.sqlite3 de raíz a data/db.sqlite3 - Actualizar settings.py: fallback SQLite a data/ cuando DB_HOST no está definido - Actualizar .gitignore: ignorar data/* pero mantener data/.gitkeep - Actualizar init_db.py: mensaje apunta a data/db.sqlite3 - Añadir data/.gitkeep para anclar la carpeta en git Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-16 16:33:26 +02:00
jjminguez	0a73b91e12	Merge pull request 'fix: corregir name en common/apps.py' (#33) from dev into master	2026-04-16 14:13:02 +00:00
jjminguez	d444021a00	Merge pull request 'fix: corregir name en common/apps.py' (#32) from pre-dev into dev	2026-04-16 14:12:59 +00:00
juanjo	9fba8938ee	fix: corregir name en common/apps.py de 'apps.common' a 'common' ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-16 16:12:40 +02:00
jjminguez	508f3f028d	Merge pull request 'refactor: reorganizar estructura app/api_config' (#31) from dev into master	2026-04-16 14:02:19 +00:00
jjminguez	7a151a4768	Merge pull request 'refactor: reorganizar estructura app/api_config' (#30) from pre-dev into dev	2026-04-16 14:02:01 +00:00
juanjo	299428741b	refactor: reorganizar estructura del proyecto al estándar app/api_config ... - core/ → app/api_config/ - apps/backend_admin/ → app/backend_admin/ - apps/common/ → app/common/ - apps/promociones/ → app/promociones/ - manage.py → app/manage.py - Añadir app/requirements.txt - Actualizar todos los imports y referencias (DJANGO_SETTINGS_MODULE, ROOT_URLCONF, WSGI_APPLICATION, INSTALLED_APPS) - Actualizar Dockerfile con nuevo WORKDIR Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-16 16:01:17 +02:00
jjminguez	bc82249a29	Merge pull request 'Merge dev into master' (#29) from dev into master	2026-04-16 13:51:32 +00:00
jjminguez	56e7d77d63	Merge pull request 'Merge pre-dev into dev' (#28) from pre-dev into dev	2026-04-16 13:51:17 +00:00
juanjo	27ccce862d	Renombrar actions.py a acciones.py en backend_admin y promociones ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-16 15:42:21 +02:00
jjminguez	f3514d399e	Merge pull request 'dev' (#27) from dev into master ... Reviewed-on: #27	2026-04-14 23:44:35 +00:00
jjminguez	1e72aa3e44	Merge pull request 'Update 0001_initial.py' (#26) from pre-dev into dev ... Reviewed-on: #26	2026-04-14 23:17:11 +00:00
minguezsanzjuanjose	84baf8fbda	Update 0001_initial.py	2026-04-15 01:16:07 +02:00
jjminguez	b08e74f459	Merge pull request 'fix' (#25) from pre-dev into dev ... Reviewed-on: #25	2026-04-14 23:02:44 +00:00
minguezsanzjuanjose	5d69f89028	fix	2026-04-15 01:01:46 +02:00
jjminguez	0ac0a859b9	Merge pull request 'dev' (#24) from dev into master ... Reviewed-on: #24	2026-04-14 21:52:57 +00:00
jjminguez	02aca6a2a6	Merge pull request 'Update Jenkinsfile' (#23) from pre-dev into dev ... Reviewed-on: #23	2026-04-14 21:48:28 +00:00
minguezsanzjuanjose	4a4d0940b3	Update Jenkinsfile	2026-04-14 23:47:24 +02:00
jjminguez	7a9a1686fa	Merge pull request 'dev' (#21) from dev into master ... Reviewed-on: #21	2026-04-14 21:28:08 +00:00
jjminguez	b4ab653c95	Merge pull request 'Update settings.py' (#22) from pre-dev into dev ... Reviewed-on: #22	2026-04-14 21:25:16 +00:00
minguezsanzjuanjose	c32092d216	Update settings.py	2026-04-14 23:24:27 +02:00
jjminguez	049764b79c	Merge pull request 'Delete 0002_alter_log_options.py' (#20) from pre-dev into dev ... Reviewed-on: #20	2026-04-14 21:03:22 +00:00
minguezsanzjuanjose	7ba79c9739	Delete 0002_alter_log_options.py	2026-04-14 23:02:45 +02:00
jjminguez	c60c140a97	Merge pull request 'cambios en migraciones' (#19) from pre-dev into dev ... Reviewed-on: #19	2026-04-14 20:46:59 +00:00
minguezsanzjuanjose	bf5a38d425	cambios en migraciones	2026-04-14 22:46:18 +02:00
jjminguez	f610eb24d4	Merge pull request 'feat: integración final de Jenkins con inyección de .env segura' (#18) from pre-dev into dev ... 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	2026-04-14 21:30:19 +02:00
jjminguez	816cc276f8	Merge pull request 'fix' (#17) from pre-dev into dev ... Reviewed-on: #17	2026-04-13 23:01:41 +00:00
minguezsanzjuanjose	9dd97b34f2	fix	2026-04-14 01:00:37 +02:00
jjminguez	5a7209badb	Merge pull request 'dev' (#16) from dev into master ... Reviewed-on: #16	2026-04-12 20:57:46 +00:00
jjminguez	d39e078fb6	Merge pull request 'fix admin status' (#15) from pre-dev into dev ... Reviewed-on: #15	2026-04-12 20:56:59 +00:00
juanjo	3da81a9495	fix admin status	2026-04-12 22:56:35 +02:00
jjminguez	ac1c024bee	Merge pull request 'endpoint de status' (#14) from pre-dev into dev ... Reviewed-on: #14	2026-04-12 20:39:31 +00:00
juanjo	e5908b1880	endpoint de status	2026-04-12 22:38:49 +02:00
jjminguez	147a1d49cc	Merge pull request 'pre-dev' (#13) from pre-dev into dev ... Reviewed-on: #13	2026-04-12 20:15:16 +00:00
juanjo	1bf3337616	Update .gitignore	2026-04-12 22:12:35 +02:00
juanjo	6fb3afa472	fix para ficheros que no se suben	2026-04-12 22:11:51 +02:00
jjminguez	8579af3f21	Merge pull request 'fix' (#12) from pre-dev into dev ... Reviewed-on: #12	2026-04-12 14:04:06 +00:00
minguezsanzjuanjose	102d7c6bfa	fix	2026-04-12 16:02:58 +02:00
jjminguez	32e3184b59	Merge pull request 'dev' (#11) from dev into master ... Reviewed-on: #11	2026-04-12 13:42:46 +00:00
jjminguez	5e04933708	Merge pull request 'ignore' (#10) from pre-dev into dev ... Reviewed-on: #10	2026-04-12 13:40:45 +00:00
minguezsanzjuanjose	ac6e336772	ignore	2026-04-12 15:38:01 +02:00
jjminguez	083375c5f0	Merge pull request 'dev' (#9) from dev into master ... Reviewed-on: #9	2026-04-12 12:10:27 +00:00
jjminguez	d9bba25437	Merge pull request 'Update Jenkinsfile' (#8) from pre-dev into dev ... Reviewed-on: #8	2026-04-12 12:09:27 +00:00
minguezsanzjuanjose	e486a0f556	Update Jenkinsfile	2026-04-12 14:08:36 +02:00
jjminguez	6f84db00cd	Merge pull request 'dev' (#7) from dev into master ... Reviewed-on: #7	2026-04-12 02:53:09 +00:00
jjminguez	b37b581a78	Merge pull request 'pre-dev' (#6) from pre-dev into dev ... Reviewed-on: #6	2026-04-12 02:52:00 +00:00
minguezsanzjuanjose	0971134702	Update docker-compose.yml	2026-04-12 04:51:32 +02:00