{"commits":[{"author":{"email":"fd88d5efd1e6384c7287f96f0f2d2092f946e444@caret.cam.ac.uk","name":"Bert Pareyn"},"sha":"264eae9fa48e66f5236d35e0271cb434f4340439","message":"Merge origin/master and fix conflicts","url":"https://api.github.com/repos/nicolaasmatthijs/3akai-ux/commits/264eae9fa48e66f5236d35e0271cb434f4340439"},{"author":{"email":"9f4b16423c106b217b24d60ff5bbc4a6d37d9a87@caret.cam.ac.uk","name":"Nicolaas Matthijs"},"sha":"133685ab79291006d481b7dd12bfb3557b26ca52","message":"Merge branch 'KERN-2411' of git://github.com/croby/3akai-ux into KERN-2411\n\n* 'KERN-2411' of git://github.com/croby/3akai-ux:\n  KERN-2411 Fixing some group message keys","url":"https://api.github.com/repos/nicolaasmatthijs/3akai-ux/commits/133685ab79291006d481b7dd12bfb3557b26ca52"},{"author":{"email":"9f4b16423c106b217b24d60ff5bbc4a6d37d9a87@caret.cam.ac.uk","name":"Nicolaas Matthijs"},"sha":"a56db23f6580f323b617befd88dfe85b6105a407","message":"Merge branch 'SAKIII-4199' of git://github.com/bp323/3akai-ux into SAKIII-4199\n\n* 'SAKIII-4199' of git://github.com/bp323/3akai-ux:\n  SAKIII-4188 Follow up fixes\n  SAKIII-4188 Fix hashchange being executed twice.\n  SAKIII-4188 Fixes per comment\n  SAKIII-4188 Fixes per code review\n  SAKIII-4188 Remove extra handleHashChange call that broke infinity scrolling\n  SAKIII-4199 Minor changes to hash handling, remove button style from check all checkbox\n  NOJIRA Fix hash handling in contacts widget\n  NOJIRA Improve hash handling in my memberships, some general improvements to the widget\n  SAKIII-4199 Fixes per comment on JIRA\n  SAKIII-4188 Fix hash change\n  SAKIII-4199 Fix for hash changes\n  SAKIII-4199 Fixes per comment on Github\n  SAKIII-4188,  SAKIII-4189, SAKIII-4190, SAKIII-4191 Fixes per comment on Github\n  SAKIII-4272 Changes to addpeople for addpeoplegroups widget are causing js errors\n  SAKIII-4200 Implement grid view for participants\n  SAKIII-4199 Hide/show header bar when appropriate\n  SAKIII-4199 Implement new designs for participants header\n  SAKIII-4190 Implement modifications to the savecontent widget\n  SAKIII-4188 Adjust share widget to be able to deal with multiple content items at once\n  SAKIII-4188 Implement new designs for my library header, SAKIII-4191 Implement grid view for libraries","url":"https://api.github.com/repos/nicolaasmatthijs/3akai-ux/commits/a56db23f6580f323b617befd88dfe85b6105a407"},{"author":{"email":"9f4b16423c106b217b24d60ff5bbc4a6d37d9a87@caret.cam.ac.uk","name":"Nicolaas Matthijs"},"sha":"56bb507c7401acb9a852ca2fc338210d07de109d","message":"SAKIII-4199 - Positioning fix for the add content button","url":"https://api.github.com/repos/nicolaasmatthijs/3akai-ux/commits/56bb507c7401acb9a852ca2fc338210d07de109d"},{"author":{"email":"9f4b16423c106b217b24d60ff5bbc4a6d37d9a87@caret.cam.ac.uk","name":"Nicolaas Matthijs"},"sha":"5d68aceda35266172d3578643cd31021d4314947","message":"Merge branch 'master' into collections\n\n* master: (22 commits)\n  SAKIII-4199 - Positioning fix for the add content button\n  KERN-2411 Fixing some group message keys\n  SAKIII-4188 Follow up fixes\n  SAKIII-4188 Fix hashchange being executed twice.\n  SAKIII-4188 Fixes per comment\n  SAKIII-4188 Fixes per code review\n  SAKIII-4188 Remove extra handleHashChange call that broke infinity scrolling\n  SAKIII-4199 Minor changes to hash handling, remove button style from check all checkbox\n  NOJIRA Fix hash handling in contacts widget\n  NOJIRA Improve hash handling in my memberships, some general improvements to the widget\n  SAKIII-4199 Fixes per comment on JIRA\n  SAKIII-4188 Fix hash change\n  SAKIII-4199 Fix for hash changes\n  SAKIII-4199 Fixes per comment on Github\n  SAKIII-4188,  SAKIII-4189, SAKIII-4190, SAKIII-4191 Fixes per comment on Github\n  SAKIII-4272 Changes to addpeople for addpeoplegroups widget are causing js errors\n  SAKIII-4200 Implement grid view for participants\n  SAKIII-4199 Hide/show header bar when appropriate\n  SAKIII-4199 Implement new designs for participants header\n  SAKIII-4190 Implement modifications to the savecontent widget\n  ...\n\nConflicts:\n\tdev/css/sakai/sakai.base.css","url":"https://api.github.com/repos/nicolaasmatthijs/3akai-ux/commits/5d68aceda35266172d3578643cd31021d4314947"}],"ref":"refs/heads/collections","head":"5d68aceda35266172d3578643cd31021d4314947","size":5,"push_id":52488232}