{"push_id":543803217,"size":21,"distinct_size":1,"ref":"refs/heads/tornado-swag","head":"32fa7a320c3935bdd3545be8f8552ada0011025e","before":"ac8cd3fa97bcf7d6864f20ba481354cb8603d7ad","commits":[{"sha":"75441879879004dffb97200b09d64937c624a9ee","author":{"email":"8003d65930619bd7fdc2218e78edb7f4e5d2b6bc@gmail.com","name":"Daniel"},"message":"small changes to some files","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/75441879879004dffb97200b09d64937c624a9ee"},{"sha":"8aecfde14d29d523ba20d5666bf827e84fc73e11","author":{"email":"8003d65930619bd7fdc2218e78edb7f4e5d2b6bc@gmail.com","name":"Daniel"},"message":"Merge remote-tracking branch 'origin/Web-Dev' into Web-Dev\n\nConflicts:\n\tprofile_handler.py","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/8aecfde14d29d523ba20d5666bf827e84fc73e11"},{"sha":"f7bc9215a428e6d281abdf4f005528d3a60de4f1","author":{"email":"9cffd7cc437ac1b44064a170784ac6e3b3091623@gmail.com","name":"ZxZombieSlayaxZ"},"message":"Fixed the login validation a bit\n\nadded the (required) tag to fields and also made passwords a (password)\nfield","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/f7bc9215a428e6d281abdf4f005528d3a60de4f1"},{"sha":"b65b9236fb228767ff5b1b12dc05af13ef032858","author":{"email":"8003d65930619bd7fdc2218e78edb7f4e5d2b6bc@gmail.com","name":"Daniel"},"message":"added drop down box","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/b65b9236fb228767ff5b1b12dc05af13ef032858"},{"sha":"fc319099b65ab83c00bea5773743baf6e9ecf33f","author":{"email":"cb840b8b85bd7612ede986804f43f06a9f5193d0@gmail.com","name":"katrinapuranik"},"message":"404 page working","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/fc319099b65ab83c00bea5773743baf6e9ecf33f"},{"sha":"0d367f9cd5159b38b4cd5634627c1dd424e6644f","author":{"email":"4adebac832aeb27d78288c58adf492d6eb932919@gmail.com","name":"Justin Zhu"},"message":"Reworking Profile Page\n\nUsername\nEmail\nSkill Level in Categories\nRecent Activity","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/0d367f9cd5159b38b4cd5634627c1dd424e6644f"},{"sha":"ab7c9d155286c0dfc46bfc975b5b27b4ac7e8ad0","author":{"email":"89eb8ef59ddb2bd5499db03ee5b1c2efee6192fa@gmail.com","name":"musomaddie"},"message":"Merge branch 'master' of https://github.com/ncss-2015-group-4/trivia","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/ab7c9d155286c0dfc46bfc975b5b27b4ac7e8ad0"},{"sha":"d5d6303b71abf61066659f24b61b4e89bf646126","author":{"email":"8f443cd6277069d34cba5d8f985fd51a7b342686@gmail.com","name":"AEthell"},"message":"Merge remote-tracking branch 'origin/master' into Web-Dev","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/d5d6303b71abf61066659f24b61b4e89bf646126"},{"sha":"e7509f6823e8e1d9b6bd5634d713cd593492b993","author":{"email":"26f6be3c144e1a038e449bd24a5cff0b6ca2e01f@hotmail.co.uk","name":"KirisakiJack"},"message":"Edited size of login boxes","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/e7509f6823e8e1d9b6bd5634d713cd593492b993"},{"sha":"0b859f3584d49a845fe9694093a09e0ab59956cf","author":{"email":"9cffd7cc437ac1b44064a170784ac6e3b3091623@gmail.com","name":"ZxZombieSlayaxZ"},"message":"Resolved mergo conflicts in login.html","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/0b859f3584d49a845fe9694093a09e0ab59956cf"},{"sha":"6420ec7c403378a4a07b2a5329d986ea5e55a30e","author":{"email":"9cffd7cc437ac1b44064a170784ac6e3b3091623@gmail.com","name":"ZxZombieSlayaxZ"},"message":"Merge branch 'master' of https://github.com/ncss-2015-group-4/trivia","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/6420ec7c403378a4a07b2a5329d986ea5e55a30e"},{"sha":"50a0f630e0f2eae0c59f1bbd80d300771c3e1235","author":{"email":"8003d65930619bd7fdc2218e78edb7f4e5d2b6bc@gmail.com","name":"Daniel"},"message":"removed leaderboard\n\nremoved leaderboard from header because it was not in MVP. can be added\nback once website is complete.","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/50a0f630e0f2eae0c59f1bbd80d300771c3e1235"},{"sha":"a6de91d813413176f2cce425a272eb0a6cbebf78","author":{"email":"cb840b8b85bd7612ede986804f43f06a9f5193d0@gmail.com","name":"katrinapuranik"},"message":"Merge conflict on trivia.py. Resolved with adding the 404 page.","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/a6de91d813413176f2cce425a272eb0a6cbebf78"},{"sha":"20f2d1a7ced5c7103dbe84ef20fe24e1169e3637","author":{"email":"8003d65930619bd7fdc2218e78edb7f4e5d2b6bc@gmail.com","name":"Daniel"},"message":"MVP for play\n\nMVP for play, does need work but lets finish the site before we put\nglitter on it. 'login' was fixed to 'Login'. Additions were added to\nCSS.","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/20f2d1a7ced5c7103dbe84ef20fe24e1169e3637"},{"sha":"f35833ebe3a5c5305ce4c2e6ca9cd901184175a6","author":{"email":"cb840b8b85bd7612ede986804f43f06a9f5193d0@gmail.com","name":"katrinapuranik"},"message":"Merge branch 'Web-Dev' of https://github.com/ncss-2015-group-4/trivia into Web-Dev","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/f35833ebe3a5c5305ce4c2e6ca9cd901184175a6"},{"sha":"164557ce1537226d2a53f7c4b135f75bfde358b0","author":{"email":"8f443cd6277069d34cba5d8f985fd51a7b342686@gmail.com","name":"AEthell"},"message":"Updated CSS for Submit Q page","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/164557ce1537226d2a53f7c4b135f75bfde358b0"},{"sha":"113bc158812ba619d9bed94da9acb5d61b617a09","author":{"email":"cb840b8b85bd7612ede986804f43f06a9f5193d0@gmail.com","name":"katrinapuranik"},"message":"fixed minor error re:indent","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/113bc158812ba619d9bed94da9acb5d61b617a09"},{"sha":"e13985496270af053ac727cc59986f3798e36d46","author":{"email":"8f443cd6277069d34cba5d8f985fd51a7b342686@gmail.com","name":"AEthell"},"message":"Merge remote-tracking branch 'origin/Web-Dev' into Web-Dev\n\nConflicts:\n\tstatic/css/csstemplate.css","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/e13985496270af053ac727cc59986f3798e36d46"},{"sha":"f449be97624f787621b6b2c878616379a6301df3","author":{"email":"8f443cd6277069d34cba5d8f985fd51a7b342686@gmail.com","name":"AEthell"},"message":"Merge branch 'Web-Dev' of https://github.com/ncss-2015-group-4/trivia into Web-Dev\n\nConflicts:\n\ttrivia.py","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/f449be97624f787621b6b2c878616379a6301df3"},{"sha":"8b5f47f0b821a64955e0c83f895e46b31a5cd9e5","author":{"email":"8f443cd6277069d34cba5d8f985fd51a7b342686@gmail.com","name":"AEthell"},"message":"Merge remote-tracking branch 'origin/master' into Web-Dev","distinct":false,"url":"https://api.github.com/repos/ncss-2015-group-4/trivia/commits/8b5f47f0b821a64955e0c83f895e46b31a5cd9e5"}]}