GitHub PushEvent at 2014-09-21 21:22:57
Repository: CI-1430-MiBusCR
Actor: alexis10
Payload: {"shas":[["b8185ff15e4aa807f572e7c9e20026893f2fc970","f645682d4fa7b8bed106c46a9a225c4626bb712a@gmail.com","servidor localizacion","jesustq",false],["807acc6b05c29f1ab9b492f83fa61b5412e6cd0b","2ffc25b2fbb5e9c04171df1f9de004e99a1a82c2@gmail.com","Cambios en la interfaz y funcionamiento del login (aparece como una opción del menú dropdown) Luego del commit, se integrará con el registro que Alexis terminó y se le agregará la funcionalidad faltante","AndonyNS",false],["d4a8fe345bd6b388613624cc28a94d914f02cd11","2ffc25b2fbb5e9c04171df1f9de004e99a1a82c2@gmail.com","Eliminación de archivos innecesarios que estaban bajo Version Control","AndonyNS",false],["0da4354b081748192d009f33834fce701214d260","2ffc25b2fbb5e9c04171df1f9de004e99a1a82c2@gmail.com","Este es el merge del master con mi branch, arreglando los siguientes conflictos y \"untracking\" algunos archivos que no eran necesarios, sobretodo esos bajo. /.gradle\nConflictos:\n\t.gitignore\n\tBuses/.gradle/1.12/taskArtifacts/cache.properties.lock\n\tBuses/.gradle/1.12/taskArtifacts/fileHashes.bin\n\tBuses/.gradle/1.12/taskArtifacts/fileSnapshots.bin\n\tBuses/.gradle/1.12/taskArtifacts/outputFileStates.bin\n\tBuses/.gradle/1.12/taskArtifacts/taskArtifacts.bin\n\tBuses/.idea/workspace.xml\n\tBuses/app/src/main/AndroidManifest.xml\n\tBuses/app/src/main/res/layout/activity_login.xml\n\tBuses/app/src/main/res/values/strings.xml\n\tBuses/build/intermediates/model_data.bin\n\tBuses/gradle.properties","AndonyNS",false],["fc87e210346a69ee689d940cd98ad8b7738aaac6","06ebd8977ced6f5c03b4f6a79981bab341c4b5a7@gmail.com","resubiendo MiBusCR","alexis10",false],["ab798a4e09ce646575f83c7605272c845538d6ec","ce754b2d9cb0c700891f17a9bd993b02acd57d12@gmail.com","Activity rutas","Esteban",false],["671bcf405927452802887e8827010758f4e6f86e","ce754b2d9cb0c700891f17a9bd993b02acd57d12@gmail.com","Menu de rutas","Esteban",false],["77ec320bb27a4cb44f75521559722d5ce1760924","ce754b2d9cb0c700891f17a9bd993b02acd57d12@gmail.com","RutasActivity.java","Esteban",false],["b0be8df0a34c41f7c7ddf5cb5519acefe2cd54d7","ce754b2d9cb0c700891f17a9bd993b02acd57d12@gmail.com","Manifest y strings","Esteban",false],["1cf64d90fbda2f28f3895f347d928746d7c2a659","f645682d4fa7b8bed106c46a9a225c4626bb712a@gmail.com","cambios en nombres de las variables","jesustq",false],["c2c4df261157c3be7165e2bb9a4bcfe4ca52cee2","f645682d4fa7b8bed106c46a9a225c4626bb712a@gmail.com","cambios hechos","jesustq",false],["eac92d47147bc441be89b7769002c993f468bacc","ce754b2d9cb0c700891f17a9bd993b02acd57d12@gmail.com","logo","Esteban",false],["5c8e91e055de332dc33506c63d6bf40e43b40c16","ce754b2d9cb0c700891f17a9bd993b02acd57d12@gmail.com","Merge branch 'master' of https://github.com/AndonyNS/CI-1430-MiBusCR","Esteban",false],["52e7ac27967c1dc584a2a3fac4613d15caeea2cb","ce754b2d9cb0c700891f17a9bd993b02acd57d12@gmail.com","logo arreglado","Esteban",false],["3ad9cf6384befce5064959a9c488c5e8ab7b3317","ce754b2d9cb0c700891f17a9bd993b02acd57d12@gmail.com","api key","Esteban",false],["c25425d9e452bdbb45af3f9c4fe031ce5f68c201","ce754b2d9cb0c700891f17a9bd993b02acd57d12@gmail.com","Ultimos arreglos","Esteban",false],["9e01aaed84be8f1f3d6646a1876b1a232111223d","f645682d4fa7b8bed106c46a9a225c4626bb712a@gmail.com","Configuracion de primera vez","jesustq",false],["a76518fd46fdfa9b8fd0c18f02b381525719d5eb","2ffc25b2fbb5e9c04171df1f9de004e99a1a82c2@gmail.com","Valida el Login con la base de datos","AndonyNS",false],["e3c6984ad08b2f6a2a6560806961b8b18d0aaa1e","f645682d4fa7b8bed106c46a9a225c4626bb712a@gmail.com","Cambios realizados a Configuracion primera vez","jesustq",false],["402f645a8e765d5b0c973f1720b920d381b16f38","2ffc25b2fbb5e9c04171df1f9de004e99a1a82c2@gmail.com","Merge branch 'master' into AndonyNS\n\nConflicts:\n\tBuses/app/src/main/AndroidManifest.xml","AndonyNS",false]],"size":22,"ref":"refs/heads/alexis10","head":"0cfe32a40990e37998d632e0b04fc4d237e76908"}