{"push_id":729989274,"size":23,"distinct_size":23,"ref":"refs/heads/masterIntegracion","head":"ecd8c30aac0b978e30a792d574fc92c98e3719b5","before":"62fbe999462d5542e5144df94e3e4102bc119be0","commits":[{"sha":"d6060ba0e55e70f7b844492565ab8bdde7109ced","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Merge branch 'masterIntegracion' of https://github.com/urukmaster/OPISPORTS into masterIntegracion\n\nConflicts:\n\tsports/src/main/java/org/opi/sports/config/WSFilter.java\n\tsports/src/main/java/org/opi/sports/contracts/TipoServicioResponse.java\n\tsports/src/main/java/org/opi/sports/controllers/HomeController.java\n\tsports/src/main/webapp/app/js/app.js\n\tsports/src/main/webapp/app/views/actividades.html\n\tsports/src/main/webapp/app/views/agendaEstablecimiento.html\n\tsports/src/main/webapp/app/views/agendaReservaciones.html\n\tsports/src/main/webapp/app/views/establecimientos.html\n\tsports/src/main/webapp/app/views/perfilEstablecimiento.html\n\tsports/src/main/webapp/app/views/retos.html\n\tsports/src/main/webapp/app/views/template.html\n\tsports/src/main/webapp/server/establecimientos.json\n\tsports/src/main/webapp/server/sidebar-menu.json\n\tsports/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF\n\tsports/target/m2e-wtp/web-resources/META-INF/maven/org.opi/sports/pom.properties\n\tsports/target/maven-archiver/pom.properties\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst\n\tsports/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst\n\tsports/target/sports.war.original\n\tsports/target/sports/app/js/app.js\n\tsports/target/sports/app/views/establecimientos.html\n\tsports/target/sports/app/views/eventos.html\n\tsports/target/sports/server/sidebar-menu.json","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/d6060ba0e55e70f7b844492565ab8bdde7109ced"},{"sha":"c2587657a2d86ac5ce54d921ea498a07eb5366e2","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Arreglos IndexEventos","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/c2587657a2d86ac5ce54d921ea498a07eb5366e2"},{"sha":"129b2e18fb15cc25459eda1c1b01a5f3f6f839ba","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Merge branch 'masterIntegracion' of https://github.com/urukmaster/OPISPORTS\n\nConflicts:\n\tsports/target/m2e-wtp/web-resources/META-INF/maven/org.opi/sports/pom.properties\n\tsports/target/maven-archiver/pom.properties\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst\n\tsports/target/sports.war.original","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/129b2e18fb15cc25459eda1c1b01a5f3f6f839ba"},{"sha":"9d3334c5f2c111076c6eadfe64a02a6b02f5cb46","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Merge branch 'masterIntegracion' of https://github.com/urukmaster/OPISPORTS\n\nConflicts:\n\tsports/src/main/webapp/app/js/Modules/Controllers/InformacionPerfilController.js\n\tsports/target/m2e-wtp/web-resources/META-INF/maven/org.opi/sports/pom.properties\n\tsports/target/maven-archiver/pom.properties\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst\n\tsports/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst\n\tsports/target/sports.war.original","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/9d3334c5f2c111076c6eadfe64a02a6b02f5cb46"},{"sha":"287683e912cdc53c22893fa83c724529580f20dd","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Merge branch 'masterIntegracion' of https://github.com/urukmaster/OPISPORTS\n\nConflicts:\n\tsports/target/m2e-wtp/web-resources/META-INF/maven/org.opi/sports/pom.properties\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/287683e912cdc53c22893fa83c724529580f20dd"},{"sha":"d3f3b4f165fa5adc8cc089374caf35547598fbf7","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"HU-37 Agenda de eventos deportivos","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/d3f3b4f165fa5adc8cc089374caf35547598fbf7"},{"sha":"7b4a20acc97d984e51f790dda50b172d7b43c6d3","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Arreglo del pom","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/7b4a20acc97d984e51f790dda50b172d7b43c6d3"},{"sha":"959d5a2f3d189ef45dc2ab4d5ba29e99b04a864e","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Merge branch 'masterIntegracion' of https://github.com/urukmaster/OPISPORTS\n\nConflicts:\n\tsports/src/main/webapp/app/js/Modules/Controllers/InformacionPerfilController.js\n\tsports/src/main/webapp/app/js/app.js\n\tsports/src/main/webapp/app/views/perfil.html\n\tsports/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF\n\tsports/target/m2e-wtp/web-resources/META-INF/maven/org.opi/sports/pom.properties\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst\n\tsports/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/959d5a2f3d189ef45dc2ab4d5ba29e99b04a864e"},{"sha":"05e31d816e6f474ad352237794beba257dd873c9","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"arreglos","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/05e31d816e6f474ad352237794beba257dd873c9"},{"sha":"1a2d75ff32efe0f4f8a9b2e90dd9ec173d68d851","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"arreglos","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/1a2d75ff32efe0f4f8a9b2e90dd9ec173d68d851"},{"sha":"cf6dd0fcd7a86f56a05eb87881d026b0c5166867","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"arreglos","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/cf6dd0fcd7a86f56a05eb87881d026b0c5166867"},{"sha":"431adb3660db7034affe148458578ebe94624788","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Merge branch 'masterIntegracion' of https://github.com/urukmaster/OPISPORTS\n\nConflicts:\n\tsports/pom.xml\n\tsports/target/m2e-wtp/web-resources/META-INF/maven/org.opi/sports/pom.properties\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/431adb3660db7034affe148458578ebe94624788"},{"sha":"1108d0a8f206309f950d79609dd25c4fc134313e","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Backend calendario eventos - Comentado","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/1108d0a8f206309f950d79609dd25c4fc134313e"},{"sha":"21a51e3c76e595fe7bbcebc629422ad0e40b1451","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Revert \"Backend calendario eventos - Comentado\"\n\nThis reverts commit 1108d0a8f206309f950d79609dd25c4fc134313e.","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/21a51e3c76e595fe7bbcebc629422ad0e40b1451"},{"sha":"96867984dccba8f1f1f45c2feeb41443e3ace9ea","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Calendario eventos - comentado","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/96867984dccba8f1f1f45c2feeb41443e3ace9ea"},{"sha":"eecbc646a2d5e0b5e242556155551aa295e51a33","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Front end - HU7 - Registrar reservaciones","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/eecbc646a2d5e0b5e242556155551aa295e51a33"},{"sha":"154a764252d4f5840d47a8653c89a5a643e87aa6","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Merge branch 'master' of https://github.com/mauriciofer/OPISPORTS into mauriciofer-master\n\nConflicts:\n\tsports/src/main/java/org/opi/sports/config/WSFilter.java\n\tsports/src/main/java/org/opi/sports/controllers/HomeController.java\n\tsports/src/main/webapp/app/js/app.js\n\tsports/src/main/webapp/app/views/establecimientos.html\n\tsports/src/main/webapp/app/views/perfilEstablecimiento.html\n\tsports/src/main/webapp/server/establecimientos.json\n\tsports/target/m2e-wtp/web-resources/META-INF/maven/org.opi/sports/pom.properties\n\tsports/target/maven-archiver/pom.properties\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst\n\tsports/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst\n\tsports/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst\n\tsports/target/sports.war.original\n\tsports/target/sports/app/js/app.js\n\tsports/target/sports/app/views/establecimientos.html\n\tsports/target/sports/app/views/eventos.html\n\tsports/target/sports/server/establecimientos.json\n\tsports/target/sports/server/sidebar-menu.json","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/154a764252d4f5840d47a8653c89a5a643e87aa6"},{"sha":"ea16868e88f0657b2c6c6ac6862e96fe69cdddfd","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Arreglo de conflictos","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/ea16868e88f0657b2c6c6ac6862e96fe69cdddfd"},{"sha":"48d77cb8e7e0023c48bf69b79e0d03fe3f8c4a25","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Merge branch 'mauriciofer-master' into masterIntegracion","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/48d77cb8e7e0023c48bf69b79e0d03fe3f8c4a25"},{"sha":"536fee4b41587690ce074d3d4687c684523ee745","author":{"email":"2daa50dc2791fb247d84af955d1e2ffea55ba7c8@ucenfotec.ac.cr","name":"mauriciofer"},"message":"Arreglos en proceso.","distinct":true,"url":"https://api.github.com/repos/urukmaster/OPISPORTS/commits/536fee4b41587690ce074d3d4687c684523ee745"}]}