Merge remote-tracking branch 'refs/remotes/origin/main'

Mergenando
2026-06-29 19:42:56 +02:00 · 2026-06-29 19:42:36 +02:00
141 changed files with 0 additions and 0 deletions
--- a/.github/workflows/deploy.ylm
+++ b/.github/workflows/deploy.ylm
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
--- a/backend/.dockerignore
+++ b/backend/.dockerignore
--- a/backend/.env.example
+++ b/backend/.env.example
--- a/backend/.gitignore
+++ b/backend/.gitignore
--- a/backend/.mvn/jvm.config
+++ b/backend/.mvn/jvm.config
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
--- a/backend/docker-compose.yml
+++ b/backend/docker-compose.yml
--- a/backend/docker/mysql-init.sql
+++ b/backend/docker/mysql-init.sql
--- a/backend/pom.xml
+++ b/backend/pom.xml
--- a/backend/src/main/java/es/recursoscatolicos/DataInitializer.java
+++ b/backend/src/main/java/es/recursoscatolicos/DataInitializer.java
--- a/backend/src/main/java/es/recursoscatolicos/RecursosCatolicosApplication.java
+++ b/backend/src/main/java/es/recursoscatolicos/RecursosCatolicosApplication.java
--- a/backend/src/main/java/es/recursoscatolicos/auth/AuthResponse.java
+++ b/backend/src/main/java/es/recursoscatolicos/auth/AuthResponse.java
--- a/backend/src/main/java/es/recursoscatolicos/auth/LoginRequest.java
+++ b/backend/src/main/java/es/recursoscatolicos/auth/LoginRequest.java
--- a/backend/src/main/java/es/recursoscatolicos/auth/RegisterRequest.java
+++ b/backend/src/main/java/es/recursoscatolicos/auth/RegisterRequest.java
--- a/backend/src/main/java/es/recursoscatolicos/controller/AuthController.java
+++ b/backend/src/main/java/es/recursoscatolicos/controller/AuthController.java
--- a/backend/src/main/java/es/recursoscatolicos/controller/CalendarioLiturgicoController.java
+++ b/backend/src/main/java/es/recursoscatolicos/controller/CalendarioLiturgicoController.java
--- a/backend/src/main/java/es/recursoscatolicos/controller/DiarioController.java
+++ b/backend/src/main/java/es/recursoscatolicos/controller/DiarioController.java
--- a/backend/src/main/java/es/recursoscatolicos/controller/DifuntoPersonalController.java
+++ b/backend/src/main/java/es/recursoscatolicos/controller/DifuntoPersonalController.java
--- a/backend/src/main/java/es/recursoscatolicos/controller/IntencionController.java
+++ b/backend/src/main/java/es/recursoscatolicos/controller/IntencionController.java
--- a/backend/src/main/java/es/recursoscatolicos/controller/ParroquiaController.java
+++ b/backend/src/main/java/es/recursoscatolicos/controller/ParroquiaController.java
--- a/backend/src/main/java/es/recursoscatolicos/controller/SantoDelDiaController.java
+++ b/backend/src/main/java/es/recursoscatolicos/controller/SantoDelDiaController.java
--- a/backend/src/main/java/es/recursoscatolicos/controller/VersoBiblicoController.java
+++ b/backend/src/main/java/es/recursoscatolicos/controller/VersoBiblicoController.java
--- a/backend/src/main/java/es/recursoscatolicos/dto/DifuntoPersonalDTO.java
+++ b/backend/src/main/java/es/recursoscatolicos/dto/DifuntoPersonalDTO.java
--- a/backend/src/main/java/es/recursoscatolicos/dto/DifuntoPersonalRequest.java
+++ b/backend/src/main/java/es/recursoscatolicos/dto/DifuntoPersonalRequest.java
--- a/backend/src/main/java/es/recursoscatolicos/dto/EntradaDiarioDTO.java
+++ b/backend/src/main/java/es/recursoscatolicos/dto/EntradaDiarioDTO.java
--- a/backend/src/main/java/es/recursoscatolicos/dto/EntradaDiarioRequest.java
+++ b/backend/src/main/java/es/recursoscatolicos/dto/EntradaDiarioRequest.java
--- a/backend/src/main/java/es/recursoscatolicos/dto/GrupoDTO.java
+++ b/backend/src/main/java/es/recursoscatolicos/dto/GrupoDTO.java
--- a/backend/src/main/java/es/recursoscatolicos/dto/IntencionDTO.java
+++ b/backend/src/main/java/es/recursoscatolicos/dto/IntencionDTO.java
--- a/backend/src/main/java/es/recursoscatolicos/dto/IntencionRequest.java
+++ b/backend/src/main/java/es/recursoscatolicos/dto/IntencionRequest.java
--- a/backend/src/main/java/es/recursoscatolicos/dto/ParroquiaDTO.java
+++ b/backend/src/main/java/es/recursoscatolicos/dto/ParroquiaDTO.java
--- a/backend/src/main/java/es/recursoscatolicos/dto/UsuarioDTO.java
+++ b/backend/src/main/java/es/recursoscatolicos/dto/UsuarioDTO.java
--- a/backend/src/main/java/es/recursoscatolicos/model/Ambito.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/Ambito.java
--- a/backend/src/main/java/es/recursoscatolicos/model/CalendarioLiturgico.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/CalendarioLiturgico.java
--- a/backend/src/main/java/es/recursoscatolicos/model/DifuntoPersonal.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/DifuntoPersonal.java
--- a/backend/src/main/java/es/recursoscatolicos/model/EntradaDiario.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/EntradaDiario.java
--- a/backend/src/main/java/es/recursoscatolicos/model/Grupo.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/Grupo.java
--- a/backend/src/main/java/es/recursoscatolicos/model/Intencion.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/Intencion.java
--- a/backend/src/main/java/es/recursoscatolicos/model/Parroquia.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/Parroquia.java
--- a/backend/src/main/java/es/recursoscatolicos/model/SantoDelDia.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/SantoDelDia.java
--- a/backend/src/main/java/es/recursoscatolicos/model/TipoUsuario.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/TipoUsuario.java
--- a/backend/src/main/java/es/recursoscatolicos/model/Usuario.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/Usuario.java
--- a/backend/src/main/java/es/recursoscatolicos/model/VersoBiblico.java
+++ b/backend/src/main/java/es/recursoscatolicos/model/VersoBiblico.java
--- a/backend/src/main/java/es/recursoscatolicos/repository/CalendarioLiturgicoRepository.java
+++ b/backend/src/main/java/es/recursoscatolicos/repository/CalendarioLiturgicoRepository.java
--- a/backend/src/main/java/es/recursoscatolicos/repository/DifuntoPersonalRepository.java
+++ b/backend/src/main/java/es/recursoscatolicos/repository/DifuntoPersonalRepository.java
--- a/backend/src/main/java/es/recursoscatolicos/repository/EntradaDiarioRepository.java
+++ b/backend/src/main/java/es/recursoscatolicos/repository/EntradaDiarioRepository.java
--- a/backend/src/main/java/es/recursoscatolicos/repository/GrupoRepository.java
+++ b/backend/src/main/java/es/recursoscatolicos/repository/GrupoRepository.java
--- a/backend/src/main/java/es/recursoscatolicos/repository/IntencionRepository.java
+++ b/backend/src/main/java/es/recursoscatolicos/repository/IntencionRepository.java
--- a/backend/src/main/java/es/recursoscatolicos/repository/ParroquiaRepository.java
+++ b/backend/src/main/java/es/recursoscatolicos/repository/ParroquiaRepository.java
--- a/backend/src/main/java/es/recursoscatolicos/repository/SantoDelDiaRepository.java
+++ b/backend/src/main/java/es/recursoscatolicos/repository/SantoDelDiaRepository.java
--- a/backend/src/main/java/es/recursoscatolicos/repository/UsuarioRepository.java
+++ b/backend/src/main/java/es/recursoscatolicos/repository/UsuarioRepository.java
--- a/backend/src/main/java/es/recursoscatolicos/repository/VersoBiblicoRepository.java
+++ b/backend/src/main/java/es/recursoscatolicos/repository/VersoBiblicoRepository.java
--- a/backend/src/main/java/es/recursoscatolicos/security/JwtAuthFilter.java
+++ b/backend/src/main/java/es/recursoscatolicos/security/JwtAuthFilter.java
--- a/backend/src/main/java/es/recursoscatolicos/security/SecurityConfig.java
+++ b/backend/src/main/java/es/recursoscatolicos/security/SecurityConfig.java
--- a/backend/src/main/java/es/recursoscatolicos/security/UserDetailsServiceImpl.java
+++ b/backend/src/main/java/es/recursoscatolicos/security/UserDetailsServiceImpl.java
--- a/backend/src/main/java/es/recursoscatolicos/service/AuthService.java
+++ b/backend/src/main/java/es/recursoscatolicos/service/AuthService.java
--- a/backend/src/main/java/es/recursoscatolicos/service/DiarioService.java
+++ b/backend/src/main/java/es/recursoscatolicos/service/DiarioService.java
--- a/backend/src/main/java/es/recursoscatolicos/service/DifuntoPersonalService.java
+++ b/backend/src/main/java/es/recursoscatolicos/service/DifuntoPersonalService.java
--- a/backend/src/main/java/es/recursoscatolicos/service/IntencionService.java
+++ b/backend/src/main/java/es/recursoscatolicos/service/IntencionService.java
--- a/backend/src/main/java/es/recursoscatolicos/service/JwtService.java
+++ b/backend/src/main/java/es/recursoscatolicos/service/JwtService.java
--- a/backend/src/main/java/es/recursoscatolicos/service/ParroquiaService.java
+++ b/backend/src/main/java/es/recursoscatolicos/service/ParroquiaService.java
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
--- a/backend/src/main/resources/calendario-liturgico.json
+++ b/backend/src/main/resources/calendario-liturgico.json
--- a/backend/src/main/resources/db/init.sql
+++ b/backend/src/main/resources/db/init.sql
--- a/backend/src/main/resources/proverbios.json
+++ b/backend/src/main/resources/proverbios.json
--- a/backend/src/main/resources/salmos.json
+++ b/backend/src/main/resources/salmos.json
--- a/frontend/biblioteca-cristiana.html
+++ b/frontend/biblioteca-cristiana.html
--- a/frontend/css/biblioteca.css
+++ b/frontend/css/biblioteca.css
--- a/frontend/css/diario.css
+++ b/frontend/css/diario.css
--- a/frontend/css/estilos.css
+++ b/frontend/css/estilos.css
--- a/frontend/css/intenciones.css
+++ b/frontend/css/intenciones.css
--- a/frontend/css/login.css
+++ b/frontend/css/login.css
--- a/frontend/css/oraciones-basicas.css
+++ b/frontend/css/oraciones-basicas.css
--- a/frontend/css/register.css
+++ b/frontend/css/register.css
--- a/frontend/data/SpanishRevisedRVR1960Bible.xml
+++ b/frontend/data/SpanishRevisedRVR1960Bible.xml
--- a/frontend/data/anno-liturgico.md
+++ b/frontend/data/anno-liturgico.md
--- a/frontend/data/biblia/libro1.xml
+++ b/frontend/data/biblia/libro1.xml
--- a/frontend/data/calendario-liturgico-25-26.pdf
+++ b/frontend/data/calendario-liturgico-25-26.pdf
--- a/frontend/data/calendario-liturgico.json
+++ b/frontend/data/calendario-liturgico.json
--- a/frontend/data/colores-liturgicos.json
+++ b/frontend/data/colores-liturgicos.json
--- a/frontend/data/difuntos.json
+++ b/frontend/data/difuntos.json
--- a/frontend/data/intenciones.json
+++ b/frontend/data/intenciones.json
--- a/frontend/data/libros.json
+++ b/frontend/data/libros.json
--- a/frontend/data/proverbios.json
+++ b/frontend/data/proverbios.json
--- a/frontend/data/salmos.json
+++ b/frontend/data/salmos.json
--- a/frontend/data/santos.json
+++ b/frontend/data/santos.json
--- a/frontend/diario-oracion.html
+++ b/frontend/diario-oracion.html
--- a/frontend/header.html
+++ b/frontend/header.html
--- a/frontend/img/biblia.jpg
+++ b/frontend/img/biblia.jpg
--- a/frontend/img/biblioteca.jpg
+++ b/frontend/img/biblioteca.jpg
--- a/frontend/img/dolorosos1.jpg
+++ b/frontend/img/dolorosos1.jpg
--- a/frontend/img/dolorosos2.jpg
+++ b/frontend/img/dolorosos2.jpg
--- a/frontend/img/dolorosos3.jpg
+++ b/frontend/img/dolorosos3.jpg
--- a/frontend/img/dolorosos4.jpg
+++ b/frontend/img/dolorosos4.jpg
--- a/frontend/img/dolorosos5.jpg
+++ b/frontend/img/dolorosos5.jpg
--- a/frontend/img/favicon.png
+++ b/frontend/img/favicon.png
--- a/frontend/img/faviconClaro.png
+++ b/frontend/img/faviconClaro.png
--- a/frontend/img/gloriosos1.jpg
+++ b/frontend/img/gloriosos1.jpg
--- a/frontend/img/gloriosos2.jpg
+++ b/frontend/img/gloriosos2.jpg
--- a/frontend/img/gloriosos3.jpg
+++ b/frontend/img/gloriosos3.jpg
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alex Villa Ema	4ca6e72ab6	Merge remote-tracking branch 'refs/remotes/origin/main'	2026-06-29 19:42:56 +02:00
Alex Villa Ema	4e684d7a3c	Mergenando	2026-06-29 19:42:36 +02:00