{"push_id":660832897,"size":8,"distinct_size":8,"ref":"refs/heads/professor","head":"bd099d14a70ef1b2fbc08ca04e28aaf0407a738f","before":"a4e7dec84112d71b41d22eb2c174ce7c9fe1fbec","commits":[{"sha":"90e6a2941511b8f27781d03b95b0dff6b80e2bee","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Corregido fallo en course al cargar de nuevo la vista de add cuando se producía un error.","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/90e6a2941511b8f27781d03b95b0dff6b80e2bee"},{"sha":"b616c28d09f67d8c01e8d5ed71f3cd622b2952bb","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/b616c28d09f67d8c01e8d5ed71f3cd622b2952bb"},{"sha":"c90456dfc134e986e3ad62ab15f6a97c2bd3d523","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Merge commit 'b5d0ef5d9f96e076445369438ea314a0e9c9d941'\n\nConflicts:\n\tsrc/main/java/es/ucm/fdi/dalgs/activity/web/ActivityController.java\n\tsrc/main/java/es/ucm/fdi/dalgs/domain/Group.java\n\tsrc/main/webapp/WEB-INF/spring/spring-security.xml\n\tsrc/main/webapp/WEB-INF/views/group/view.jsp","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/c90456dfc134e986e3ad62ab15f6a97c2bd3d523"},{"sha":"550b054d303a91bd78f35270623999f57bd4dedb","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Merge commit '64746ec401ce8df896e6680f1a033d18cb2ab69e'\n\nConflicts:\n\tsrc/main/java/es/ucm/fdi/dalgs/activity/web/ActivityController.java\n\tsrc/main/java/es/ucm/fdi/dalgs/domain/Group.java\n\tsrc/main/webapp/WEB-INF/spring/spring-security.xml\n\tsrc/main/webapp/WEB-INF/views/group/view.jsp","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/550b054d303a91bd78f35270623999f57bd4dedb"},{"sha":"9baa020d015aa77a5bdf8ddf11ae11d5a39c7d54","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Buzon modificado y funcionando, excepto la papelera de course y group","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/9baa020d015aa77a5bdf8ddf11ae11d5a39c7d54"},{"sha":"cc2d3d4fb824817f9ff39a8c931e37ad3968f7c8","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"Merge commit 'a4e7dec84112d71b41d22eb2c174ce7c9fe1fbec'\n\nConflicts:\n\tsrc/main/java/es/ucm/fdi/dalgs/domain/Activity.java\n\tsrc/main/java/es/ucm/fdi/dalgs/domain/ExternalActivity.java\n\tsrc/main/java/es/ucm/fdi/dalgs/externalActivity/service/ExternalActivityService.java\n\tsrc/main/java/es/ucm/fdi/dalgs/group/service/GroupService.java","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/cc2d3d4fb824817f9ff39a8c931e37ad3968f7c8"},{"sha":"7422cdba484e372cbde3c0dd56497a74462a8e0c","author":{"email":"7a6b2c0abe4ec9efbc270c9c926ea6b851dc2074@gmail.com","name":"Roberto García Sánchez"},"message":"arreglado error al mostrar las actividades del curso en un grupo. remember me deshabitado por un error.","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/7422cdba484e372cbde3c0dd56497a74462a8e0c"},{"sha":"bd099d14a70ef1b2fbc08ca04e28aaf0407a738f","author":{"email":"ee911ab897b4505183e1e89988fa8faa9b8e48f5@gmail.com","name":"Almudena Fernandez Romo"},"message":"External activity list","distinct":true,"url":"https://api.github.com/repos/romoAlmudena/tfg/commits/bd099d14a70ef1b2fbc08ca04e28aaf0407a738f"}]}