{"push_id":847719754,"size":17,"distinct_size":1,"ref":"refs/heads/stuehmer","head":"29b1e55bbfa83a4e53c38ec8a68076656c9fa5ae","before":"b10438693b73cd9ed28c285b90c048596166def9","commits":[{"sha":"ff4845f5e95751f3c35bcd7a204e70e7abb4b7ca","author":{"email":"08d808ce577c58feefd803f908b755a470203767@gmail.com","name":"kathb"},"message":"Merge branch 'shared' of https://github.com/CMPUT301F15T02/Xperts into kathb","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/ff4845f5e95751f3c35bcd7a204e70e7abb4b7ca"},{"sha":"78dd02351ffac5d24bb6671cc41700d30ce171e5","author":{"email":"e57fa923d809b83ea45e6483023c15215840766e@ualberta.ca","name":"hammadj"},"message":"Merge branch 'master' into hammad","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/78dd02351ffac5d24bb6671cc41700d30ce171e5"},{"sha":"39b96ab1c1bdf9db14d23a81e9e3393fd6a6796c","author":{"email":"e57fa923d809b83ea45e6483023c15215840766e@ualberta.ca","name":"hammadj"},"message":"created empty unit tests","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/39b96ab1c1bdf9db14d23a81e9e3393fd6a6796c"},{"sha":"fc47694dc116f249b7b3be6e9fcdbcb65164f236","author":{"email":"e57fa923d809b83ea45e6483023c15215840766e@ualberta.ca","name":"hammadj"},"message":"Refactored all use case tests to activity instrumentation tests for main activity","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/fc47694dc116f249b7b3be6e9fcdbcb65164f236"},{"sha":"f949560fcb28bb366c75890d0211942a2b9bf931","author":{"email":"08d808ce577c58feefd803f908b755a470203767@gmail.com","name":"kathb"},"message":"Merge branch 'hammad' of https://github.com/CMPUT301F15T02/Xperts into kathb","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/f949560fcb28bb366c75890d0211942a2b9bf931"},{"sha":"3bf6c24e61cf1185cbfadd1d43661add76fb8a14","author":{"email":"5efa1c7935f3decf29dcafbf1ae71001a61c8058@ualberta.ca","name":"SeannMurdock"},"message":"added(some) unit tests for User","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/3bf6c24e61cf1185cbfadd1d43661add76fb8a14"},{"sha":"fb7d267fa6dc40813a8a46d57a127b1f061359f2","author":{"email":"08d808ce577c58feefd803f908b755a470203767@gmail.com","name":"kathb"},"message":"Added methods to Trade class, test for TradeTest","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/fb7d267fa6dc40813a8a46d57a127b1f061359f2"},{"sha":"b0b0cb701cbec68a019b6952a778de41271795b1","author":{"email":"08d808ce577c58feefd803f908b755a470203767@gmail.com","name":"kathb"},"message":"Merge branch 'Seann' of https://github.com/CMPUT301F15T02/Xperts into kathb","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/b0b0cb701cbec68a019b6952a778de41271795b1"},{"sha":"297d3aa06b635e1791052477d5be00e8084a878f","author":{"email":"08d808ce577c58feefd803f908b755a470203767@gmail.com","name":"kathb"},"message":"minor changes","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/297d3aa06b635e1791052477d5be00e8084a878f"},{"sha":"28cb4642afcfc1ece7abc4689ef20ff5c0581ef0","author":{"email":"08d808ce577c58feefd803f908b755a470203767@gmail.com","name":"kathb"},"message":"Merge branch 'stuehmer' of https://github.com/CMPUT301F15T02/Xperts into kathb","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/28cb4642afcfc1ece7abc4689ef20ff5c0581ef0"},{"sha":"698c3d79dff7a3a69c45ef760767180600149409","author":{"email":"08d808ce577c58feefd803f908b755a470203767@gmail.com","name":"kathb"},"message":"Added TradeState classes, tests for Trade class","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/698c3d79dff7a3a69c45ef760767180600149409"},{"sha":"ebb52bf5e624d6c1f3d4e79585cf027f0808919a","author":{"email":"08d808ce577c58feefd803f908b755a470203767@gmail.com","name":"kathb"},"message":"Implemented TradeManager","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/ebb52bf5e624d6c1f3d4e79585cf027f0808919a"},{"sha":"be5dd3e2d54099082e80ea675556b6a8e9772599","author":{"email":"08d808ce577c58feefd803f908b755a470203767@gmail.com","name":"kathb"},"message":"Added TradeManager test","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/be5dd3e2d54099082e80ea675556b6a8e9772599"},{"sha":"bce5ef92508537fef2252b7da34fa31d889d4dd7","author":{"email":"e57fa923d809b83ea45e6483023c15215840766e@ualberta.ca","name":"hammadj"},"message":"UI layouts put together","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/bce5ef92508537fef2252b7da34fa31d889d4dd7"},{"sha":"0bdcdea9774c107a5c4d88ad624b89c1f30c2173","author":{"email":"e57fa923d809b83ea45e6483023c15215840766e@ualberta.ca","name":"hammadj"},"message":"Merge branch 'kathb' into hammad\n\nConflicts:\n\tXpertsApp/build/intermediates/dex-cache/cache.xml","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/0bdcdea9774c107a5c4d88ad624b89c1f30c2173"},{"sha":"d851e0410b604342a9fa91dc54919e9bc069977a","author":{"email":"e57fa923d809b83ea45e6483023c15215840766e@ualberta.ca","name":"hammadj"},"message":"Merge remote-tracking branch 'origin/stuehmer' into hammad","distinct":false,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/d851e0410b604342a9fa91dc54919e9bc069977a"},{"sha":"29b1e55bbfa83a4e53c38ec8a68076656c9fa5ae","author":{"email":"e4fc33ddce7130d1a75aeb306c64525d48e5ee31@ualberta.ca","name":"Justin"},"message":"Fixed merge conflict","distinct":true,"url":"https://api.github.com/repos/CMPUT301F15T02/Xperts/commits/29b1e55bbfa83a4e53c38ec8a68076656c9fa5ae"}]}