* origin/master:
Remove unused imports
upgrade sip.js to 0.7.5
Moved polling files back to components folder
Adds link to meteor issue on comment, remove unused import
Remove logs, and add some removed code back
Changes Router in order for the livereloading to work again
Fixed a small issue with reduce() in the poll annotation
Made polling buttons accessible
try to fix the reload issue
Updated packages and fixed some of the warnings introduced by React 15.2.0
Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
Centering polling buttons
Title and calculated styling for the polling UI
Replaced polling under the whiteboard
fixes html5 clinet logout and nav-bar
fixes html5 clinet logout and nav-bar
fixes html5 clinet logout and nav-bar
fixes html5 clinet logout and nav-bar
* origin/master:
upgrade sip.js to 0.7.5
Moved polling files back to components folder
Fixed a small issue with reduce() in the poll annotation
Made polling buttons accessible
Updated packages and fixed some of the warnings introduced by React 15.2.0
Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
Centering polling buttons
Title and calculated styling for the polling UI
Mark open chat as active
Remove some old code
Changes the way user actions are rendered
Replaced polling under the whiteboard
Solve issues from github comments
Remove color-generator because it is not being used
polish code
Updates the userlist
Conflicts:
bigbluebutton-html5/imports/ui/components/app/container.jsx
* upstream/master:
Changed 'let' to 'const' where it was possible and adjusted imports
Fixed a bug with Polls deletion from all meetings
Fixed all the 120+ linter warnings
Fixed a bug with the deletion of the Poll
Conflicts:
bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
