Commits · 32f2dd4ac5858a1b2f5fafc4800116eecb36c2d8 · Nahuel Mereles Rodriguez / misuperproyecto

13 May, 2022 1 commit

Merge branch 'develop' into 'crearBootcamp' · 32f2dd4a

# Conflicts:
#   src/main/java/com/roshka/proyectofinal/ProtectedResource.java
#   src/main/webapp/index.html

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 'mejoras-vistas' into 'develop' · 026d518c
```
EL home actualizado

See merge request jbaez/ProyectoFinal-Bootcamp!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
- Merge branch 'elugo' into 'develop' · 7dfecacd
```
Elugo

See merge request jbaez/ProyectoFinal-Bootcamp!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
- 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 jbaez/ProyectoFinal-Bootcamp!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
- Cambios en el formulario,saveservlet,agregado formulario en index,creado javascript · cb95be3a
  Yovan Martinez committed May 12, 2022
  
  cb95be3a Browse Files
- Merge branch 'develop' into elugo · e3218568
  Emanuel Lugo committed May 12, 2022
  
  e3218568 Browse Files
- archivo jovan · 495b70b3
  Emanuel Lugo committed May 12, 2022
  
  495b70b3 Browse Files
- login parcial · 35b9138f
  Emanuel Lugo committed May 12, 2022
  
  35b9138f Browse Files
- Imports to jacarta · f1f3ee4e
  Emanuel Lugo committed May 12, 2022
  
  f1f3ee4e Browse Files
- login form added · ad414c11
  Emanuel Lugo committed May 12, 2022
  
  ad414c11 Browse Files
- Cambio de javax a jakarta imports, clase LoginHandler · 35aee765
  Josebaezx committed May 11, 2022
  
  35aee765 Browse Files
- Se agregara excepcion de archivo .idea/encodings.xml · 55fe6d52
  Josebaezx committed May 11, 2022
  
  55fe6d52 Browse Files
- Merge remote-tracking branch 'origin/nahuel' into yovan · 202fcdd6
  Yovan Martinez committed May 11, 2022
  
  202fcdd6 Browse Files
- Merge branch 'master' into yovan · d19aebd9
  Yovan Martinez committed May 11, 2022
  
  d19aebd9 Browse Files
11 May, 2022 16 commits
- Merge branch 'angel' into 'develop' · 47298590
```
Angel

See merge request jbaez/ProyectoFinal-Bootcamp!8
```
  Jose Baez committed May 11, 2022
  47298590 Browse Files
- Merge branch 'nahuel' into 'develop' · 699d65ce
```
Creacion de entidades profesor,usuario,lenguaje,bootcamp con respectivos saveServlets y DAO

See merge request jbaez/ProyectoFinal-Bootcamp!7
```
  Jose Baez committed May 11, 2022
  699d65ce Browse Files
- home de la pagina principal · 33f22ebb
  Angel Zarate committed May 11, 2022
  
  33f22ebb Browse Files
- Creacion de entidades profesor,usuario,lenguaje,bootcamp con respectivos saveServlets y DAO · f0b4abc3
  Nahuel Mereles Rodriguez committed May 11, 2022
  
  f0b4abc3 Browse Files
- Merge branch 'yovan' into 'develop' · 07e20637
```
Yovan

See merge request jbaez/ProyectoFinal-Bootcamp!6
```
  Jose Baez committed May 11, 2022
  07e20637 Browse Files
- Merge branch 'userPage' into 'develop' · 98fd132e
```
LogginHandler y RecursoProtegido - Estructura anhadida

See merge request jbaez/ProyectoFinal-Bootcamp!4
```
  Jose Baez committed May 11, 2022
  98fd132e Browse Files
- Creacion de las entidades,logica de creacion de entidades · dc7ee200
  Nahuel Mereles Rodriguez committed May 11, 2022
  
  dc7ee200 Browse Files
- Editado formulario, creacion de postulanteDao,SaveServlet,correccion errores Postulante · 644d0014
  Yovan Martinez committed May 11, 2022
  
  644d0014 Browse Files
- Merge branch 'database' into yovan · c0947e8e
  Yovan Martinez committed May 11, 2022
  
  c0947e8e Browse Files
- Editado objeto postulante y creado postulanteDao · 33fae571
  Yovan Martinez committed May 11, 2022
  
  33fae571 Browse Files
- Merge branch 'database' into 'develop' · 84c17ecb
```
Database

See merge request jbaez/ProyectoFinal-Bootcamp!3
```
  Jose Baez committed May 11, 2022
  84c17ecb Browse Files
- Se agrega base de datos Bootcamp_th · 60e0e5e5
  Jose Baez committed May 11, 2022
  
  60e0e5e5 Browse Files
- Se agrega clase data base principal · c7b5913b
  Jose Baez committed May 11, 2022
  
  c7b5913b Browse Files
- Creado el formulario y el objeto postulante · c92fa525
  Yovan Martinez committed May 11, 2022
  
  c92fa525 Browse Files
- Creado el formulario y el objeto postulante · e378212c
  Yovan Martinez committed May 11, 2022
  
  e378212c Browse Files
- LogginHandler y RecursoProtegido - Estructura anhadida · ab9d7927
  Emanuel Lugo committed May 11, 2022
  
  ab9d7927 Browse Files