{"push_id":1118443832,"size":5,"distinct_size":1,"ref":"refs/heads/master","head":"fff78a5e73dd1468c3fb1fa937c7e5c96fa16513","before":"4f4a11f7dbe99fb315aca35f2b576e426305e2e3","commits":[{"sha":"c63a672509a7719e15950def0dad5b9ad5218626","author":{"email":"d5e252c1bc273c3d91e482698e285f1333dd6b99@tamu.edu","name":"michael-mckenna"},"message":"Added Backendless register/login/signout functionality","distinct":false,"url":"https://api.github.com/repos/Trivolution/MugClub-Android/commits/c63a672509a7719e15950def0dad5b9ad5218626"},{"sha":"a5e667827aae5509a3f0cc24b6a1eecf0bc1b64e","author":{"email":"d5e252c1bc273c3d91e482698e285f1333dd6b99@tamu.edu","name":"michael-mckenna"},"message":"Merge branch 'master' of https://github.com/Trivolution/MugClub-Android into mm-api_singleton\n\nConflicts:\n\tapp/build.gradle\n\tapp/src/main/java/trivolution/com/mugclub/API/ParseAPI.java\n\tapp/src/main/java/trivolution/com/mugclub/Controllers/MainActivity.java\n\tapp/src/main/java/trivolution/com/mugclub/Controllers/SignUpActivity.java\n\nAlso renamed the parse api class, finished registration, login, and logout logic with the new user system.","distinct":false,"url":"https://api.github.com/repos/Trivolution/MugClub-Android/commits/a5e667827aae5509a3f0cc24b6a1eecf0bc1b64e"},{"sha":"bd5f40d309a244665718f6a98a07241a82444972","author":{"email":"d5e252c1bc273c3d91e482698e285f1333dd6b99@tamu.edu","name":"michael-mckenna"},"message":"final adjustments to user system","distinct":false,"url":"https://api.github.com/repos/Trivolution/MugClub-Android/commits/bd5f40d309a244665718f6a98a07241a82444972"},{"sha":"6d3bd109514e926de964ce20368190a9d180527e","author":{"email":"d5e252c1bc273c3d91e482698e285f1333dd6b99@tamu.edu","name":"michael-mckenna"},"message":"Merge branch 'master' of https://github.com/Trivolution/MugClub-Android into mm-api_singleton\n\nConflicts:\n\tapp/src/main/java/trivolution/com/mugclub/API/BeerTourAPI.java\n\tapp/src/main/java/trivolution/com/mugclub/Controllers/LoginActivity.java\n\tapp/src/main/java/trivolution/com/mugclub/Controllers/SignUpActivity.java\n\nNEW:\n- Fully functional user system\n- check if user has logged on\n\nTODO:\n - add a temp screen (extension of the launch screen) where the code to check if the user has signed in before will be placed.","distinct":false,"url":"https://api.github.com/repos/Trivolution/MugClub-Android/commits/6d3bd109514e926de964ce20368190a9d180527e"},{"sha":"fff78a5e73dd1468c3fb1fa937c7e5c96fa16513","author":{"email":"d5e252c1bc273c3d91e482698e285f1333dd6b99@tamu.edu","name":"michael-mckenna"},"message":"Merge pull request #64 from Trivolution/mm-api_singleton\n\nMm api singleton","distinct":true,"url":"https://api.github.com/repos/Trivolution/MugClub-Android/commits/fff78a5e73dd1468c3fb1fa937c7e5c96fa16513"}]}