gcampes 903ba22713 Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 ... * upstream/master: Removed carriage returns from bigbluebutton.properties make function export default fix Meteor.Error removed duplication fixed lint issue added suggestions removed console logs fixed lint issues added moderator condition Shows main setting options based on role		2016-11-29 08:25:59 -02:00
..
.meteor	fix .meteor changes	2016-11-14 14:57:39 -02:00
client	Add code to handle breakout rooms in html5	2016-11-07 13:52:39 -02:00
imports	Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5	2016-11-29 08:25:59 -02:00
log	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
private/config	added html5 stun request and reply	2016-10-25 07:59:14 -07:00
public	play audio file to test speakers/audio output	2016-11-21 21:06:19 +00:00
server	Fix merge conflicts	2016-11-23 13:33:51 -02:00
tests	Fixed all the 120+ linter warnings	2016-06-27 11:24:37 -07:00
.gitignore	HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js	2016-08-23 14:35:28 -07:00
.jscsrc	Incorporated linting into the build process.	2016-04-06 10:06:08 -03:00
grunt-instructions.txt	Updated the instructions on running Grunt.	2016-04-06 10:08:33 -03:00
Gruntfile.js	HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js	2016-08-23 14:35:28 -07:00
package.json	Fix issues from merge	2016-11-16 15:44:05 -02:00
start.sh	clean up	2016-08-24 23:13:42 +00:00