{"push_id":769871785,"size":5,"distinct_size":5,"ref":"refs/heads/develop","head":"8556624b7ffe8601b646495ed67c90cf424e7590","before":"161b8427c48c799ae304d3667d71e3cebd0753b3","commits":[{"sha":"1a7a2a9617036a8f48ef6b1c3b294f5e8b612d90","author":{"email":"ae7bf6260285a53b0d09004fd0a919e00366cbfc@vt.edu","name":"Michael Stewart"},"message":"give me all the thoughts with the prompt?","distinct":true,"url":"https://api.github.com/repos/VT-CHCI/Thought-Swap/commits/1a7a2a9617036a8f48ef6b1c3b294f5e8b612d90"},{"sha":"826af1f87d34be7d4a9954f42e32770d7233f853","author":{"email":"ae7bf6260285a53b0d09004fd0a919e00366cbfc@vt.edu","name":"Michael Stewart"},"message":"Merge branch 'develop' of github.com:VT-CHCI/Thought-Swap into develop\n\n# By James Matthew Beamer\n# Via James Matthew Beamer\n* 'develop' of github.com:VT-CHCI/Thought-Swap:\n  Updated the facilitators status view bar with bootstrap with an addition to new <code> fonts for counters.\n  Added in toastr notifications for user feedback. Could not add in new session because it is not implemented yet. Fixes #31 . Fixes #54 .\n  Including toastr as a dependency in order to be used throughout website.","distinct":true,"url":"https://api.github.com/repos/VT-CHCI/Thought-Swap/commits/826af1f87d34be7d4a9954f42e32770d7233f853"},{"sha":"4c09c6447edc19fb5d4153b709615256f01dd456","author":{"email":"ae7bf6260285a53b0d09004fd0a919e00366cbfc@vt.edu","name":"Michael Stewart"},"message":"added toast to bower","distinct":true,"url":"https://api.github.com/repos/VT-CHCI/Thought-Swap/commits/4c09c6447edc19fb5d4153b709615256f01dd456"},{"sha":"44510ebdabbe5a86c9f2ca5da41f280c7304b185","author":{"email":"ae7bf6260285a53b0d09004fd0a919e00366cbfc@vt.edu","name":"Michael Stewart"},"message":"Merge branch 'develop' of github.com:VT-CHCI/Thought-Swap into develop\n\n# By jmb2331 (9) and Adam Barnes (7)\n# Via Adam Barnes (3) and jmb2331 (3)\n* 'develop' of github.com:VT-CHCI/Thought-Swap:\n  Removed all &nbsp and added appropriate styling in its place. fixes #69\n  Added ngMorph to received thoughts, allowing the facilitator to read all of the received thought if it is cut off fixes #16\n  Implemented Styling for drag and drop and started work on ngMorph by adding it as a button on the thought with eventual functionality\n  Fixed this bug because previously facilitators were unable to access there individual groups from the Group Management Page.\n  tgm: stopping point before dndplaceholder styling goosehunt\n  Fixed a registration issue because I made some mistake previously solving a registration bug that didn't fully solve the problem.\n  Session status numbers in the facilitator view (top bar) now animate on update. Used $scope.watch and a custom bounce animation from animate.css Fixes #70\n  I made these changes because it is better practice and more clear to display the specific error of \"Username must be unique\" to the user when during the process of registration.\n  Updated server and UI to reflect intent of new session button. Button now clears prompt on facilitator and participant and replaces it with a new default prompt associated with the new session. Thought history of participant is also cleared. Fixes #60\n  These changes are because when one facilitator signs out and another signs in the new facilitator will only see his/her groups.\n  This change is because panels make the thoughts better looking along with displaying the thought id on the upper left header.\n  deleting border from thoughts because it is more pleasing to the eye.\n  working on thoughts as panels\n  add thought id to thought\n  Added close button because we wanted a way to exit out of toasts.\n  Implemented Drag and Drop Functionality with the help of the angular dndLists project. Tested with 6 thoughts and found basic functionality present. Additional styling may be needed. Fixes #48\n\nConflicts:\n\tbower.json","distinct":true,"url":"https://api.github.com/repos/VT-CHCI/Thought-Swap/commits/44510ebdabbe5a86c9f2ca5da41f280c7304b185"},{"sha":"8556624b7ffe8601b646495ed67c90cf424e7590","author":{"email":"ae7bf6260285a53b0d09004fd0a919e00366cbfc@vt.edu","name":"Michael Stewart"},"message":"Merge branch 'develop' of github.com:VT-CHCI/Thought-Swap into develop\n\n# By Adam Barnes\n# Via Adam Barnes\n* 'develop' of github.com:VT-CHCI/Thought-Swap:\n  Implemented logging for all events in the events table with the exception of thought re-organization Quick fixed a bug where distributions were not being persisted in the database\n  Implemented private environment variables\n\nConflicts:\n\tapp.models.js\n\tapp/core/register.controller.js\n\tapp/facilitator/reciever.controller.js\n\tapp/facilitator/reciever.html\n\tapp/index.html\n\tapp/services/user.service.js\n\tserver.js","distinct":true,"url":"https://api.github.com/repos/VT-CHCI/Thought-Swap/commits/8556624b7ffe8601b646495ed67c90cf424e7590"}]}