{"push_id":926555395,"size":18,"distinct_size":3,"ref":"refs/heads/dn","head":"ade9c65b9ae47100b391c406b61b62e123e08c3b","before":"119e730157b26d6eeb0c72b02bbf5f7b852b8e32","commits":[{"sha":"674862a634e16646fa0d315d146fdc902ab3f7bb","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"EventsDao","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/674862a634e16646fa0d315d146fdc902ab3f7bb"},{"sha":"8f1a3229a1be488c1f9413b442bfe76ab1246b7b","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dbPostNoSqlSwitch\n\n# Conflicts:\n#\tweb_project/2dv512-app/src/dv512/model/dao/EventsDAO.java","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/8f1a3229a1be488c1f9413b442bfe76ab1246b7b"},{"sha":"9fd66bcaa3d992b3ca929ee861b8beab627e5764","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"fixed conflict","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/9fd66bcaa3d992b3ca929ee861b8beab627e5764"},{"sha":"b8fae1dab3ce9095ee661129f894ff9009aebd8d","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"No update","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/b8fae1dab3ce9095ee661129f894ff9009aebd8d"},{"sha":"0b09cb2181e137ee2c880d08c6e8b2ac372dc2d3","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dbPostNoSqlSwitch","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/0b09cb2181e137ee2c880d08c6e8b2ac372dc2d3"},{"sha":"40c3343455bc5b01c4d9eeb942e7bea42a58a3fc","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dbPostNoSqlSwitch\n\n# Conflicts:\n#\tweb_project/2dv512-app/WebContent/user/createevent.xhtml","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/40c3343455bc5b01c4d9eeb942e7bea42a58a3fc"},{"sha":"dbcbaf5706371e7f33fefcc4042cfac51671ae9c","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Fixed conflict","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/dbcbaf5706371e7f33fefcc4042cfac51671ae9c"},{"sha":"8c621ded055459c4e7fb27e887805f18e747179a","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Event related updates\n\nFixed event css so it works with Chrome browser\nFixed event location showing properly on map when editing and creating\nEditEventController updated to use the correct controllers.\nFixed update functionality in EventDAO","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/8c621ded055459c4e7fb27e887805f18e747179a"},{"sha":"814919963eaa5bfec348da26d4a533166025486f","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Feed update\n\nAdded date conversion to the Event class\nUpdated feed so that the date of an event is shown","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/814919963eaa5bfec348da26d4a533166025486f"},{"sha":"b35677275a93f57d2ed6126d78f9f8ceb40d7ff8","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dbPostNoSqlSwitch","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/b35677275a93f57d2ed6126d78f9f8ceb40d7ff8"},{"sha":"0f64494b26f67882f30476ffd1e2350839a7a6d5","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Fixed conflicts","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/0f64494b26f67882f30476ffd1e2350839a7a6d5"},{"sha":"d41c6fd0f0e0c7b9222c3c0212ab22226593741e","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Date/Cancel/Dialog\n\nFixed date in feed added cancel flag in event table, worked on cancel\nevent dialog, Not finsihed","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/d41c6fd0f0e0c7b9222c3c0212ab22226593741e"},{"sha":"3869dd1965dd4ce8514432500478ccabfbc2b5cb","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Notifications/Input validation / Canceled events\n\nadded notifications for canceled and updated events\nfixed css and input validition for create/edit event\nfixed cancled events not being selected from db","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/3869dd1965dd4ce8514432500478ccabfbc2b5cb"},{"sha":"3c2b0ec1533edf8b8794bbe9ace2f930886697b6","author":{"email":"c5b708da78e7262d0426bb1ee138302154a050a6@gmail.com","name":"Daniel Nilsson"},"message":"cleaning","distinct":true,"url":"https://api.github.com/repos/dblixt/2DV512/commits/3c2b0ec1533edf8b8794bbe9ace2f930886697b6"},{"sha":"7e9ba5fe487f9975b88a5bea86b2449040fadb53","author":{"email":"eb325996951883598fdf97cbef8dc72eb6004137@hotmail.com","name":"dblixt"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dbPostNoSqlSwitch\n\n# Conflicts:\n#\tweb_project/2dv512-app/WebContent/user/notifications.xhtml\n#\tweb_project/2dv512-app/src/dv512/model/Notification.java\n#\tweb_project/2dv512-app/src/dv512/model/dao/EventsDAO.java","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/7e9ba5fe487f9975b88a5bea86b2449040fadb53"},{"sha":"95b58c117092b33caf442c2c83526b5d3f265b93","author":{"email":"c5b708da78e7262d0426bb1ee138302154a050a6@gmail.com","name":"Daniel Nilsson"},"message":"Merge pull request #37 from dblixt/dbPostNoSqlSwitch\n\nDbpostnosqlswitch","distinct":false,"url":"https://api.github.com/repos/dblixt/2DV512/commits/95b58c117092b33caf442c2c83526b5d3f265b93"},{"sha":"9f93e78c267a0110d9839247a935fa669cf44fed","author":{"email":"c5b708da78e7262d0426bb1ee138302154a050a6@gmail.com","name":"Daniel Nilsson"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into dn","distinct":true,"url":"https://api.github.com/repos/dblixt/2DV512/commits/9f93e78c267a0110d9839247a935fa669cf44fed"},{"sha":"ade9c65b9ae47100b391c406b61b62e123e08c3b","author":{"email":"c5b708da78e7262d0426bb1ee138302154a050a6@gmail.com","name":"Daniel Nilsson"},"message":"small fixes + css cleanup\n\n- fixed map bugs in view event\n- css cleanup: profile, dog, feed, event","distinct":true,"url":"https://api.github.com/repos/dblixt/2DV512/commits/ade9c65b9ae47100b391c406b61b62e123e08c3b"}]}