bigbluebutton-Github/bigbluebutton-html5
gcampes c7f7d5b58a Merge remote-tracking branch 'upstream/master' into settings-refactor
* upstream/master: (53 commits)
  center modal title
  HTML5 - removed unused imports, fixed variable names
  Added a missing import
  Updated icon sets to the latest
  Moved the recording systemd scripts into the core directory
  record-and-playback: Split rap-worker into separate workers per step.
  cleanup
  audio join - apply structure and style from designs
  "Video Chat" Layout has a dark background, controls are and title are removed in this layout.
  Delete unused layout event class and videconf view.
  HTML5 - changed underscore to lodash
  revert tabIndex change
  add local folder
  remove unused imports
  move handleExitAudio to service
  remove merge conflict
  fix more linting issues
  lint nav settings dropdown container
  remove unused imports
  change function name
  ...
2017-03-24 09:30:41 -03:00
..
.meteor Change how we load shared files from flash 2017-03-08 13:49:44 +00:00
client Fix merge conflicts 2017-03-13 17:19:43 +00:00
imports Merge remote-tracking branch 'upstream/master' into settings-refactor 2017-03-24 09:30:41 -03:00
log move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
private Merge remote-tracking branch 'upstream/master' into settings-refactor 2017-03-24 09:30:41 -03:00
public Updated icon sets to the latest 2017-03-23 09:15:33 -07:00
server Refactor handlers inside /phone to the /user folder 2017-02-23 18:52:44 +00:00
tests Fixed all the 120+ linter warnings 2016-06-27 11:24:37 -07:00
.gitignore Add missing configuration file 2017-02-06 19:14:48 +00: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 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into br-kick 2017-03-20 14:44:51 -04:00
start.sh clean up 2016-08-24 23:13:42 +00:00