12 Commits

Author	SHA1	Message	Date
Laily Ajellu	f0cdbfaf2e	Fixed merge conflicts	2016-08-23 16:45:28 -07:00
Lajellu	8e7b1d6317	HTML5 - Changes config organization and all files dependant on config files	2016-08-17 08:48:03 -07:00
Anton Georgiev	6a984c2b68	adding captions support in html5 (part1)	2016-07-14 12:03:30 -07:00
Oleksandr Zhurbenko	bcfa3d41ec	Linting	2016-07-08 16:13:26 -07:00
Gabriel Carvalho de Campes	537d8753fe	Merge remote-tracking branch 'origin/master' into router-changes ... * 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	2016-07-08 11:59:05 +00:00
Gabriel Carvalho de Campes	6c4eae35bb	Adds link to meteor issue on comment, remove unused import	2016-07-07 16:15:12 +00:00
Gabriel Carvalho de Campes	e8f1a877c4	Remove logs, and add some removed code back	2016-07-07 14:46:18 +00:00
Gabriel Carvalho de Campes	ac3353d855	Changes Router in order for the livereloading to work again	2016-07-07 14:01:40 +00:00
Oleksandr Zhurbenko	83fff53269	Replaced polling under the whiteboard	2016-06-29 15:00:06 -07:00
Oleksandr Zhurbenko	390935e304	Changed 'let' to 'const' where it was possible and adjusted imports	2016-06-27 14:48:46 -07:00
Oleksandr Zhurbenko	8b4747a89d	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07:00
Anton Georgiev	9cf03a8ce8	move helpers; extract nodejsApp	2016-06-01 17:18:13 +00:00