Commits · e69fa75f8d16f17715fa4127c9eff8d7af9d1917 · Jose Baez / ProyectoFinal-Bootcamp · GitLab

14 May, 2022 2 commits
- Merge branch 'mejoras-vistas2' into 'develop' · e69fa75f
```
formulario con los estilos integrados

See merge request !21
```
  Jose Baez committed May 14, 2022
  e69fa75f Browse Files
- formulario con los estilos integrados · f4aa29e0
  Angel Zarate committed May 14, 2022
  
  f4aa29e0 Browse Files
13 May, 2022 15 commits
- Merge branch 'vistasrebe' into 'develop' · 26266afa
```
Vistasrebe

See merge request !20
```
  Jose Baez committed May 13, 2022
  26266afa Browse Files
- Se crea vista html de usuario · 501091b7
  Rebecca Arzamendia committed May 13, 2022
  
  501091b7 Browse Files
- Se agrega libreria jstl · 64656c03
  Jose Baez committed May 13, 2022
  
  64656c03 Browse Files
- Merge branch 'login' into 'develop' · e95f4c47
```
Login

See merge request !18
```
  Jose Baez committed May 13, 2022
  e95f4c47 Browse Files
- Merge branch 'formulario_jsp' into 'develop' · 07bbf7a0
```
Formulario jsp

See merge request !16
```
  Jose Baez committed May 13, 2022
  07bbf7a0 Browse Files
- borrado comentarios en el formulario,mejorado la sidentacion · 32de296d
  Yovan Martinez committed May 13, 2022
  
  32de296d Browse Files
- Cambiado el formulario a jsp para listar lenguajes dinamicos actualizados de la… · aeab3e8c
```
Cambiado el formulario a jsp para listar lenguajes dinamicos actualizados de la base de datos,borrado codigo basura en index,correcion de direcion en index
```
  Yovan Martinez committed May 13, 2022
  aeab3e8c Browse Files
- form eliminado · abdfd63a
  Emanuel Lugo committed May 13, 2022
  
  abdfd63a Browse Files
- protected resource updated · a87e6390
  Emanuel Lugo committed May 13, 2022
  
  a87e6390 Browse Files
- Merge branch 'yovan' into develop · f775ac12
  Yovan Martinez committed May 13, 2022
  
  f775ac12 Browse Files
- Merge branch 'develop' of… · 9e3a0caa
```
Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into develop
```
  Yovan Martinez committed May 13, 2022
  9e3a0caa Browse Files
- terminado carga de datos del postulante a excepcion de sus respectivos lenguajes · 31535b9f
  Yovan Martinez committed May 13, 2022
  
  31535b9f Browse Files
- loginServlet updated · 55f46bc4
  Emanuel Lugo committed May 13, 2022
  
  55f46bc4 Browse Files
- Merge branch 'crearBootcamp' into 'develop' · 61e49c50
```
Crear bootcamp

See merge request !14
```
  Jose Baez committed May 13, 2022
  61e49c50 Browse Files
- Merge branch 'develop' into 'crearBootcamp' · 32f2dd4a
```
# Conflicts:
#   src/main/java/com/roshka/proyectofinal/ProtectedResource.java
#   src/main/webapp/index.html
```
  Jose Baez committed May 13, 2022
  32f2dd4a Browse Files
12 May, 2022 23 commits
- Renderizado de lenguajes para la creacion de bootcamps · 09231ba9
  Nahuel Mereles Rodriguez committed May 12, 2022
  
  09231ba9 Browse Files
- Merge branch 'master' into yovan · 81a14f18
  Yovan Martinez committed May 12, 2022
  
  81a14f18 Browse Files
- Merge branch 'develop' · d71423c1
  Yovan Martinez committed May 12, 2022
  
  d71423c1 Browse Files
- Merge branch 'master' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp · 46655f87
  Yovan Martinez committed May 12, 2022
  
  46655f87 Browse Files
- sin terminar carga de postulante_lenguaje · 8b14e3dc
  Yovan Martinez committed May 12, 2022
  
  8b14e3dc Browse Files
- Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp · 6a3a4625
  Rebecca Arzamendia committed May 12, 2022
  
  6a3a4625 Browse Files
- Merge branch 'mejoras-vistas' into 'develop' · 026d518c
```
EL home actualizado

See merge request !13
```
  Jose Baez committed May 12, 2022
  026d518c Browse Files
- Merge branch 'develop' into 'mejoras-vistas' · 610ea52a
```
# Conflicts:
#   src/main/java/com/roshka/proyectofinal/ProtectedResource.java
```
  Jose Baez committed May 12, 2022
  610ea52a Browse Files
- EL home actualizado · 10dcf211
  Angel Zarate committed May 12, 2022
  
  10dcf211 Browse Files
- Terminado validacion para evitar ingreso de mismo correo en el mismo bootcamp · a11b3b7a
  Yovan Martinez committed May 12, 2022
  
  a11b3b7a Browse Files
- Cambios formulario para adquirir datos de lenguajes · d2611581
  Yovan Martinez committed May 12, 2022
  
  d2611581 Browse Files
- Trabajando validacion de correo · 27b3f24e
  Yovan Martinez committed May 12, 2022
  
  27b3f24e Browse Files
- Trabajando validacion correo · 74ceb612
  Yovan Martinez committed May 12, 2022
  
  74ceb612 Browse Files
- Merge branch 'elugo' into 'develop' · 7dfecacd
```
Elugo

See merge request !10
```
  Emanuel Lugo committed May 12, 2022
  7dfecacd Browse Files
- Merge branch 'develop' of… · e14c1af2
```
Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into develop
```
  Yovan Martinez committed May 12, 2022
  e14c1af2 Browse Files
- Login with MD5 HASH ENCRYPTION ADDED · 67a9e868
  Emanuel Lugo committed May 12, 2022
  
  67a9e868 Browse Files
- haciendo el formulario para la creacion de bootcamps · 25f6b840
  Nahuel Mereles Rodriguez committed May 12, 2022
  
  25f6b840 Browse Files
- formulario jsp creado para futuras pruebas de creacion de bootcamps · 15f7c4ba
  Nahuel Mereles Rodriguez committed May 12, 2022
  
  15f7c4ba Browse Files
- Merge branch 'yovan' into 'develop' · 0a5d285b
```
Yovan

See merge request !9
```
  Jose Baez committed May 12, 2022
  0a5d285b Browse Files
- Cambios formulario para adquirir datos de lenguajes · d2ababb0
  Yovan Martinez committed May 12, 2022
  
  d2ababb0 Browse Files
- Conectado el formulario con la base de datos, prueba de carga exitosa,dependecia para postgres · 6a53e4f2
  Yovan Martinez committed May 12, 2022
  
  6a53e4f2 Browse Files
- Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp · a947d0ad
  Nahuel Mereles Rodriguez committed May 12, 2022
  
  a947d0ad Browse Files
- Merge branch 'master' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp · db261d6b
  Nahuel Mereles Rodriguez committed May 12, 2022
  
  db261d6b Browse Files