BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
537d8753fe
bigbluebutton-Github/bigbluebutton-html5
History
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
..
.meteor Merge pull request #3145 from oswaldoacauan/feature-actionsbar 2016-05-20 17:29:44 -04:00
client Add i18n to chat form 2016-06-02 17:32:42 -03:00
imports Merge remote-tracking branch 'origin/master' into router-changes 2016-07-08 11:59:05 +00:00
lib Added scaling on window resize for the slide 2016-06-01 16:37:51 -07:00
log move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
public/fonts Add basic styles for new design 2016-05-02 19:42:54 -03:00
server Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 2016-06-02 15:20:41 -07:00
tests Fixed all the 120+ linter warnings 2016-06-27 11:24:37 -07:00
.gitignore move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
.jscsrc Incorporated linting into the build process. 2016-04-06 10:06:08 -03:00
config.js Fixed all the 120+ linter warnings 2016-06-27 11:24:37 -07:00
grunt-instructions.txt Updated the instructions on running Grunt. 2016-04-06 10:08:33 -03:00
Gruntfile.js Linting, changed line endings from Windows to Unix 2016-05-30 15:07:02 -07:00
package.json Updated packages and fixed some of the warnings introduced by React 15.2.0 2016-07-04 17:06:18 -07:00
settings-development.json Fix nav-bar userlist toggle icon 2016-05-20 13:39:58 -03:00
settings-production.json Split the Meteor command into options stored as Meteor settings. 2016-04-28 18:27:43 -04:00
start.sh Revert changes to start.sh and remove useless file added on my last commit 2016-05-31 17:39:11 -03:00