perroned dc3dd43f1a Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton ... Conflicts: bigbluebutton-html5/imports/api/polls/polls.js bigbluebutton-html5/imports/ui/components/app/AppService.js		2016-05-12 13:58:06 -05:00
..
.meteor	Add i18n, modular layouts and basic styles	2016-05-03 17:40:46 -03:00
client	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-05-12 13:58:06 -05:00
imports	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-05-12 13:58:06 -05:00
lib	Switch from ion-router to react-router	2016-04-28 15:57:14 -04:00
log
public/fonts	Add basic styles for new design	2016-05-02 19:42:54 -03:00
server	restructure modifiers and methods	2016-05-12 17:43:59 +00:00
tests	restructure modifiers and methods	2016-05-12 17:43:59 +00:00
.gitignore
.jscsrc	Incorporated linting into the build process.	2016-04-06 10:06:08 -03:00
config.js	linting	2016-05-04 21:49:01 +00:00
grunt-instructions.txt	Updated the instructions on running Grunt.	2016-04-06 10:08:33 -03:00
Gruntfile.js	Forced the linter tasks to finish despite warnings.	2016-05-05 18:27:27 -04:00
package.json	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging	2016-05-12 18:08:44 +00:00
settings-development.json	Split the Meteor command into options stored as Meteor settings.	2016-04-28 18:27:43 -04:00
settings-production.json	Split the Meteor command into options stored as Meteor settings.	2016-04-28 18:27:43 -04:00
start.sh	make start.sh executable	2016-04-21 21:54:30 +00:00