{"push_id":568176864,"size":6,"distinct_size":6,"ref":"refs/heads/master","head":"88479187fc498d4c7239706062b7e2ab3592dcda","before":"b9e1ec20205bce57c1202c43e92cc69d3d99d521","commits":[{"sha":"17d2e885a8ce2b68b50c17763cfc8ad054756ae8","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"sin cambios","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/17d2e885a8ce2b68b50c17763cfc8ad054756ae8"},{"sha":"2802fb22251611cc3f3229c65d9f43bb7c96c0bb","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Merge commit 'e9fce7754cd51d589549062eec0466ca59f39a88'\n\nConflicts:\n\ttarget/m2e-wtp/web-resources/META-INF/maven/com.example/tfg/pom.properties","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/2802fb22251611cc3f3229c65d9f43bb7c96c0bb"},{"sha":"497fb6ff7680c5f8f11a39b8a8d864b2de7a1719","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Corregida una url.","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/497fb6ff7680c5f8f11a39b8a8d864b2de7a1719"},{"sha":"3da2625c87a1bfc224340fae10443a5d5259d79f","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Merge commit 'b9e1ec20205bce57c1202c43e92cc69d3d99d521'\n\nConflicts:\n\tsrc/main/java/com/example/tfg/repository/implementation/AcademicTermDaoImp.java\n\ttarget/classes/com/example/tfg/repository/implementation/AcademicTermDaoImp.class\n\ttarget/classes/com/example/tfg/web/AcademicTermController.class","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/3da2625c87a1bfc224340fae10443a5d5259d79f"},{"sha":"08b4c78fa2f8a61b33abb136ccfc29c4bee06a97","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"deletes funcionando.","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/08b4c78fa2f8a61b33abb136ccfc29c4bee06a97"},{"sha":"88479187fc498d4c7239706062b7e2ab3592dcda","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"Eliminado Checkbox en Course\nEliminada cláusula @Where y controlado en las  querys\nCreado el Service y Dao de User\nCreada clase para Charset\nCreado controller de User : Listado de todos los usuarios y ver un usuario concreto (incluye paginación)\nPagina personalizada para User y para Admin\nAñadido nuevos datos de prueba\nCorregida redireccion tras terminar de modificar una actividad\nUn poco de limpieza de código\nAñadida seguridad para la contraseña (CIFRADO SHA)\n\nA TENER EN CUENTA: Falla el persist a traves del CSV","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/88479187fc498d4c7239706062b7e2ab3592dcda"}]}