{"push_id":2375495607,"size":31,"distinct_size":1,"ref":"refs/heads/master","head":"22276df52166aac7c8730f5e23d104a1008dd148","before":"e3ec8f72dbb3ca2bf0f993c8d9cca44c0d3cf270","commits":[{"sha":"616c71caef5a9516c35da815142f91b2b13dcf91","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"Created Archive branch. It will house the starter code.\n\nThis way we can delete starter code from Main if desired.","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/616c71caef5a9516c35da815142f91b2b13dcf91"},{"sha":"a1f83623b306b946c3052c1ad359754898f7a5b5","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"Created base files for emoji selection","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/a1f83623b306b946c3052c1ad359754898f7a5b5"},{"sha":"e4afda539b08a39764577f45e86916d2572c4cab","author":{"name":"hamer073","email":"5526e696c4e8c3e88ce05c8ea32d230ab357444f@morris.umn.edu"},"message":"Add two tests for what we expect the home page to do with emoji selection","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/e4afda539b08a39764577f45e86916d2572c4cab"},{"sha":"5f40a89073b5e35d29ae0c7cac17da92a4c2de50","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"Created Emoji object.","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/5f40a89073b5e35d29ae0c7cac17da92a4c2de50"},{"sha":"279b458d7b347aeb67c141f79413ab3207eb3f12","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"named emoji selector page to /emoji-selector","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/279b458d7b347aeb67c141f79413ab3207eb3f12"},{"sha":"e325ed15e542ca31e7635b09aa60c06cf5f4df69","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"Created basic emoji selection page","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/e325ed15e542ca31e7635b09aa60c06cf5f4df69"},{"sha":"a0ef619c4cfb6d178ee51b2ef58d0093459e5e06","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"#5 added title","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/a0ef619c4cfb6d178ee51b2ef58d0093459e5e06"},{"sha":"8f6c9c69ff4581c8924cfa60e77225904f15248b","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"#5 Completed selector featuring 4 emoji pictures\n\nHappy, Sad, Angry, Neutral","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/8f6c9c69ff4581c8924cfa60e77225904f15248b"},{"sha":"18a789029032990647dfd81aa8af3a8da8c0d7d9","author":{"name":"hamer073","email":"5526e696c4e8c3e88ce05c8ea32d230ab357444f@morris.umn.edu"},"message":"Add two tests for what we expect the home page to do with emoji selection\n\nAdd a GoalController.java jile and implement some basic functions for it","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/18a789029032990647dfd81aa8af3a8da8c0d7d9"},{"sha":"a8dd918bee117baa412d2873df4dfecc8b38d4ae","author":{"name":"hamer073","email":"5526e696c4e8c3e88ce05c8ea32d230ab357444f@morris.umn.edu"},"message":"Update the GoalsController file so that the constructor works properly","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/a8dd918bee117baa412d2873df4dfecc8b38d4ae"},{"sha":"2b909bf13c37faad0ed03fa7cee491383f73afdc","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"added user type to Emoji","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/2b909bf13c37faad0ed03fa7cee491383f73afdc"},{"sha":"a60a324f95a86c57f2bc42cb02698313e47d5d13","author":{"name":"hamer073","email":"5526e696c4e8c3e88ce05c8ea32d230ab357444f@morris.umn.edu"},"message":"Add tests for emoji-selector\n-Checks that the title displays properly\n-Checks that all of the emojis we want are displayed","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/a60a324f95a86c57f2bc42cb02698313e47d5d13"},{"sha":"14cd38776674d4dbddfc58faef7efedb5a31ec23","author":{"name":"hamer073","email":"5526e696c4e8c3e88ce05c8ea32d230ab357444f@morris.umn.edu"},"message":"Create test file for emoji-selector.component\n-The files that had the actual testing stuff in them didn't get commited/merged in the last push","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/14cd38776674d4dbddfc58faef7efedb5a31ec23"},{"sha":"7a2ea6c7cdbcd0947fee1a536bcdefe0a3275155","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"#12 can select emoji, user, time.","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/7a2ea6c7cdbcd0947fee1a536bcdefe0a3275155"},{"sha":"d2ab3a31b2a1bf006c6d159b67caf3fff9b8120d","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"#12 basis for emoji output, need server for testing","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/d2ab3a31b2a1bf006c6d159b67caf3fff9b8120d"},{"sha":"5c20fdfae5fae0d7ddb69181f0dd5ba3e78595ec","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"Merge remote-tracking branch 'origin/Dev2_Electric_Boogaloo' into Dev2_Electric_Boogaloo\n\n# Conflicts:\n#\tclient/src/app/emojis/emoji-selector.component.ts","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/5c20fdfae5fae0d7ddb69181f0dd5ba3e78595ec"},{"sha":"ff1d388676d248ed9164ded411edd69af1855938","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"#12 added emojis to assets","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/ff1d388676d248ed9164ded411edd69af1855938"},{"sha":"85124a5f02fe3fdd97c16e714a2c19b4336ed110","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"uncommented service functions","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/85124a5f02fe3fdd97c16e714a2c19b4336ed110"},{"sha":"bfb11e40f6e3efd6867ae4d07029683f8a5df97a","author":{"name":"hamer073","email":"5526e696c4e8c3e88ce05c8ea32d230ab357444f@morris.umn.edu"},"message":"Add EmojiController\n-Handles adding emojis to the database as well as getting a single emoji entry from the database and getting multiple emojis from the database\n\nAdd EmojiRequestHandler\n-Handles the requests from the server related to emojis","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/bfb11e40f6e3efd6867ae4d07029683f8a5df97a"},{"sha":"3e86d78d3c1f775f9e44cf98384c3bd1265001bd","author":{"name":"blake376","email":"56d18a0693ed2caa2e007952425e40476244ff28@morris.umn.edu"},"message":"Merge branch 'Archive' into Dev2_Electric_Boogaloo","distinct":false,"url":"https://api.github.com/repos/UMM-CSci-3601-S18/iteration-1-ased/commits/3e86d78d3c1f775f9e44cf98384c3bd1265001bd"}]}
{"actor":{"display_login":"Blake376"}}