Master epp#35

Open

Zaexv wants to merge 131 commits intorafaelpernil2:master-eppfrom

FranGambero:master-epp

Commits on Apr 30, 2018

Cambios Fran 30/04

Takox
authored and
Takox
committed
Cambios Fran 30/04

Takox
authored and
Takox
committed
alta.jsp y ServletCrearUusuario

Takox
authored and
Takox
committed
Added hash for password and account number generator
rafaelpernil2
committed
Merge branch 'master' into master-rpb
rafaelpernil2
authored
Merge pull request #10 from rafaelpernil2/master-rpb
rafaelpernil2
authored

Commits on May 1, 2018

ServletLogin y login.jsp creados

Takox
authored and
Takox
committed
Update README.md
FranGambero
authored
Update README.md
FranGambero
authored

Commits on May 3, 2018

He creado dos servlet, ServletEditar usuario que me redirige y me pinta

Usuario
authored and
Usuario
committed
Merge pull request #11 from rafaelpernil2/master-jch
JCH611
authored
indexUsuario finalizado

Takox
authored and
Takox
committed
indexUsuario finalizado2

Takox
authored and
Takox
committed
Merge branch 'master' into prueba-fran
FranGambero
authored
Merge pull request #12 from rafaelpernil2/prueba-fran
FranGambero
authored
Merge origin/master into HEAD

EduardoP
authored and
EduardoP
committed
configuracion.jsp y servletEditar/Actualizar funcionando

Takox
authored and
Takox
committed

Commits on May 4, 2018

Merge pull request #13 from rafaelpernil2/prueba-fran
Zaexv
authored
Merge origin/master into master-epp-bueno

EduardoP
authored and
EduardoP
committed
Creación Básica del Servlet de Búsqueda

EduardoP
authored and
EduardoP
committed
Terminado ServletUsuario.java
VictorGarciaKaikkonen
committed
Merge origin/master-epp-bueno into master-vgk
VictorGarciaKaikkonen
committed
He añadadido una JPQL tmovimientoFacade, en la cual mediante un dni

Usuario
authored and
Usuario
committed
Comit Porque Si

EduardoP
authored and
EduardoP
committed
Resolucion de conflictos y mergeo con lo de Jesus.

EduardoP
authored and
EduardoP
committed
Terminado de modificar el ServletTransferencia

Usuario
authored and
Usuario
committed
Merge origin/master-jch into master-epp-bueno

EduardoP
authored and
EduardoP
committed
Pruebas de Transferencias

EduardoP
authored and
EduardoP
committed
Pruebas de Transferencias

EduardoP
authored and
EduardoP
committed
Mas fallos de mierda

EduardoP
authored and
EduardoP
committed
Servlets Terminados:

EduardoP
authored and
EduardoP
committed
Merge pull request #14 from rafaelpernil2/master-epp-bueno
Zaexv
authored
Terminado indexEmpleado.jsp
VictorGarciaKaikkonen
committed
exito.jsp, error.jsp, ServletCerrarSesion

Takox
authored and
Takox
committed
Based on master-vgk (for last updates) and created ServletCreaMovimiento and nuevoMovimiento.jsp
rafaelpernil2
committed
Merge origin/master-epp-bueno into master-rpb
rafaelpernil2
committed
Minor fixes
rafaelpernil2
committed

Commits on May 5, 2018

Merge origin/master into prueba-fran

Takox
authored and
Takox
committed
merge Edu, Jesús y Fran

Takox
authored and
Takox
committed
Merge pull request #15 from rafaelpernil2/prueba-fran
FranGambero
authored
Update README.md
FranGambero
authored
Merge origin/master-vgk into master-jch

Usuario
authored and
Usuario
committed
Corregido el bug de Tmovimiento al no controlar listas nulas.

EduardoP
authored and
EduardoP
committed
Merge origin/master-rpb into master-epp-bueno

EduardoP
authored and
EduardoP
committed
Merge origin/master-rpb into master-epp-bueno

EduardoP
authored and
EduardoP
committed
Merge pull request #16 from rafaelpernil2/master-epp-bueno
Zaexv
authored
Corregido que al crear un usuario redirija donde debe.

EduardoP
authored and
EduardoP
committed
Merge pull request #17 from rafaelpernil2/master-epp-bueno
Zaexv
authored
Merge origin/master-jch into master-epp-bueno

EduardoP
authored and
EduardoP
committed
gestionarUsuario terminado, confirmarEliminarMovimiento, ServletEliminarUsuario, ServletEliminaMovimiento
rafaelpernil2
committed
Merge pull request #19 from rafaelpernil2/master-rpb
rafaelpernil2
authored
Merge origin/master
rafaelpernil2
committed
Resueltos ligeros problemas actualizando datos. Todo funcional
rafaelpernil2
committed
Merge pull request #20 from rafaelpernil2/master-rpb
rafaelpernil2
authored
Corregido que al crear un usuario redirija donde debe.

EduardoP
authored and
EduardoP
committed
Merge branch 'master' into master-epp-bueno
Zaexv
authored
Merge pull request #21 from rafaelpernil2/master-epp-bueno
Zaexv
authored
Ya funciona el crear y eliminar movimientos. Y está añadido al jsp de usuarioSeleccionado la función de eliminar movimiento
rafaelpernil2
committed
Merge pull request #22 from rafaelpernil2/master-rpb
rafaelpernil2
authored

Commits on May 6, 2018

Commits on May 24, 2018

Merge pull request #1 from Takox/master-vgk
FranGambero
authored

Commits on May 28, 2018

Commits on May 30, 2018

Commits on May 31, 2018

UsuarioBean ya funciona el Init
jesus
committed
Merge pull request #4 from Takox/master-jch
JCH611
authored
Quitadas las clases que no se usaban
VictorGarciaKaikkonen
committed
Corregido que al crear un usuario redirija donde debe.

EduardoP
authored and
EduardoP
committed
Corregido que al crear un usuario redirija donde debe.

EduardoP
authored and
EduardoP
committed
Corregido que al crear un usuario redirija donde debe.

EduardoP
authored and
EduardoP
committed
Corregido que al crear un usuario redirija donde debe.

EduardoP
authored and
EduardoP
committed
Corregido que al crear un usuario redirija donde debe.

EduardoP
authored and
EduardoP
committed
-Funcionalidad de realizarTransferencia terminada a falta de redireccionamientos y navegación.
rafaelpernil2
committed
loginFuncionando al 100%

Takox
authored and
Takox
committed
loginFuncionando al 110%

Takox
authored and
Takox
committed
Merge pull request #5 from Takox/master-fgs
VictorGarciaKaikkonen
authored
RealizarTransferencia funcional
rafaelpernil2
authored
Configuracion.xhtml terminada, aunque podriamos pensar en añadir mensa_
jesus
committed

Commits on Jun 1, 2018

Alta.xhtml hecho.
jesus
committed
UsuarioSeleccionado.xhtml terminado.
jesus
committed
gestionarUsuario.xhtml terminado
jesus
committed
Todos los errores de los commit anteriores corregidos
jesus
committed
conflictos con master resueltos
jesus
committed
Merge pull request #7 from Takox/master-jch
JCH611
authored
Merge pull request #2 from Takox/master-vgk

EduardoP
authored and
EduardoP
committed
Corregido que al crear un usuario redirija donde debe.

EduardoP
authored and
EduardoP
committed
Actualizacion de mi rama

EduardoP
authored and
EduardoP
committed
Merge master into master-epp

EduardoP
authored and
EduardoP
committed
termino de Mergear

EduardoP
authored and
EduardoP
committed
Correccion de bugs generados por el Merge

EduardoP
authored and
EduardoP
committed
Arreglado fran victor jesus
jesus
committed
Trabajo muy duro en Movimientos y pequeña Edición en UsuarioBean,

EduardoP
authored and
EduardoP
committed
Merge origin/master-jch into master-epp

EduardoP
authored and
EduardoP
committed

Commits on Jun 3, 2018

Con bootStrap

EduardoP
authored and
EduardoP
committed
Creacion de editarMovimiento, borrarMovimiento, crearMovimiento.

EduardoP
authored and
EduardoP
committed