Commits · 7eec9834497c659f84d2bc3d4300eee726215b73 · Jose Baez / ProyectoFinal-Bootcamp · GitLab

18 May, 2022 19 commits
- solucion error merge · 7eec9834
  Rebecca Arzamendia committed May 18, 2022
  
  7eec9834 Browse Files
- Merge branch 'develop' of… · 8523ecd5
```
Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into filtrosbootcamp
```
  Rebecca Arzamendia committed May 18, 2022
  8523ecd5 Browse Files
- Creado filtro de bootcamp · 4e7e473f
  Rebecca Arzamendia committed May 18, 2022
  
  4e7e473f Browse Files
- Merge branch 'mejorasCss5' into 'develop' · cbb8ab95
```
Mejoras css5

See merge request !44
```
  Jose Baez committed May 18, 2022
  cbb8ab95 Browse Files
- Resolviendo conflictos · a906d1a5
  Angel Zarate committed May 18, 2022
  
  a906d1a5 Browse Files
- Mejoras en el index,home y menu TH · c6602f87
  Angel Zarate committed May 18, 2022
  
  c6602f87 Browse Files
- Merge branch 'sendemail3' into 'develop' · dfc70628
```
Sendemail3

See merge request !43
```
  Jose Baez committed May 18, 2022
  dfc70628 Browse Files
- botones agregados en filtro postulante · 5ba34b13
  Nahuel Mereles Rodriguez committed May 18, 2022
  
  5ba34b13 Browse Files
- Merge branch 'develop' of… · 67f08ed1
```
Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into sendemail3
```
  Nahuel Mereles Rodriguez committed May 18, 2022
  67f08ed1 Browse Files
- Merge branch 'ramaAux' into 'develop' · e5804c67
```
Rama aux

See merge request !42
```
  Jose Baez committed May 18, 2022
  e5804c67 Browse Files
- Funcionalidad de Mails automaticos y personalizados terminado · bf925f0c
  Nahuel Mereles Rodriguez committed May 18, 2022
  
  bf925f0c Browse Files
- Merge branch 'sendemail3' into 'develop' · 10379695
```
Sendemail3

See merge request !41
```
  Jose Baez committed May 18, 2022
  10379695 Browse Files
- Agregando condicional para mandar mails solo al aceptar un postulante · 6e153395
  Nahuel Mereles Rodriguez committed May 18, 2022
  
  6e153395 Browse Files
- Mejoras en el menu login · 5def2229
  Angel Zarate committed May 18, 2022
  
  5def2229 Browse Files
- Funcionalidad del mail personalizado iniciado · 452970fa
  Nahuel Mereles Rodriguez committed May 18, 2022
  
  452970fa Browse Files
- seguridad a filtros postulante · 274c63cc
  Emanuel Lugo committed May 18, 2022
  
  274c63cc Browse Files
- botones de desplazamiento anhadidos · 4f4be366
  Emanuel Lugo committed May 18, 2022
  
  4f4be366 Browse Files
- Merge branch 'develop' of… · 8a737a47
```
Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into ramaAux
```
  Emanuel Lugo committed May 18, 2022
  8a737a47 Browse Files
- botones de desplazamiento · 047e3375
  Emanuel Lugo committed May 18, 2022
  
  047e3375 Browse Files
17 May, 2022 21 commits
- Merge branch 'develop' of… · 9da93b2f
```
Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into mejorasCss3
```
  Angel Zarate committed May 17, 2022
  9da93b2f Browse Files
- Mejoramientos de las paginas · 8790f36b
  Angel Zarate committed May 17, 2022
  
  8790f36b Browse Files
- Merge branch 'ramaAux' into 'develop' · 3bd0957d
```
Rama aux

See merge request !40
```
  Jose Baez committed May 17, 2022
  3bd0957d Browse Files
- Merge branch 'develop' of… · fc083485
```
Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into mejorasCss2
```
  Angel Zarate committed May 17, 2022
  fc083485 Browse Files
- Mejorando el css de postulantes · 699d85b2
  Angel Zarate committed May 17, 2022
  
  699d85b2 Browse Files
- Merge branch 'sendemail3' into 'develop' · 3e42a461
```
Arreglando errores traidos del pull

See merge request !39
```
  Jose Baez committed May 17, 2022
  3e42a461 Browse Files
- Arreglando errores traidos del pull · e10e05ae
  Nahuel Mereles Rodriguez committed May 17, 2022
  
  e10e05ae Browse Files
- Merge branch 'sendemail3' into 'develop' · 4b3ad9a6
```
Sendemail3

See merge request !38
```
  Jose Baez committed May 17, 2022
  4b3ad9a6 Browse Files
- Solucion errores y agregadi email de aceptacion · eb7dcb21
  Nahuel Mereles Rodriguez committed May 17, 2022
  
  eb7dcb21 Browse Files
- Merge branch 'develop' of… · 86ca4453
```
Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into sendmail2
```
  Nahuel Mereles Rodriguez committed May 17, 2022
  86ca4453 Browse Files
- Arreglado creacion de bootcamp · 08e8c132
  Nahuel Mereles Rodriguez committed May 17, 2022
  
  08e8c132 Browse Files
- Correccion bug filtro postulante · 7f75482d
  Jose Baez committed May 17, 2022
  
  7f75482d Browse Files
- Merge branch 'postulantediseñosyovan' into 'develop' · 8cad19f6
```
Postulantediseñosyovan

See merge request !36
```
  Jose Baez committed May 17, 2022
  8cad19f6 Browse Files
- elimado codigo basura · 5672de56
  Angel Zarate committed May 17, 2022
  
  5672de56 Browse Files
- arreglo profesor dao · a79341b2
  Angel Zarate committed May 17, 2022
  
  a79341b2 Browse Files
- Merge con develop · 0b41fb7d
  Angel Zarate committed May 17, 2022
  
  0b41fb7d Browse Files
- cambio misc.xml · efea4bc6
  Angel Zarate committed May 17, 2022
  
  efea4bc6 Browse Files
- Merge branch 'trabajovistas2' into 'develop' · d3a6ea52
```
Trabajovistas2

See merge request !35
```
  Jose Baez committed May 17, 2022
  d3a6ea52 Browse Files
- Merge branch 'develop' of… · 94794bc5
```
Merge branch 'develop' of https://phoebe.roshka.com/gitlab/jbaez/ProyectoFinal-Bootcamp into trabajovistas2
```
  Rebecca Arzamendia committed May 17, 2022
  94794bc5 Browse Files
- Postulante y diseño termiando · 704284db
  Angel Zarate committed May 17, 2022
  
  704284db Browse Files
- Merge branch 'porfavorquetodosalgabien2' into 'develop' · 322d1b51
```
error de formulario

See merge request !34
```
  Jose Baez committed May 17, 2022
  322d1b51 Browse Files