bigbluebutton-Github/bigbluebutton-html5/imports/api
Klaus Klein 1db64e2bb7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl
* 'master' of https://github.com/bigbluebutton/bigbluebutton:
  HTML5 - removed 'lockedLayout' variable
  Update README.md
  Improved the detection if IP addresses in bbb-conf
  Removing event listeners in handleHide
  Fixed click listeners' initialization
  Bump version number to 1.1.0
  Update BigBlueButton.html
  remove new lines being rendered in log/development.log
  remove new operator
  add suggested changes
  HTML5 - put the order at media class
  HTML5 - removed unused media query
  HTML5 - removed unused media query
  HTML5 - fixed order and slide control position
  change file permission to 644
  fix new lint issues
  set files permission to 644
  Fix client lint issues except those which are comment related
  HTML5 - fixed fixed closed-caption display
  HTML5 - fixed closed-caption display
2017-06-01 16:38:58 -03:00
..
acl Acl refactor working 2017-06-01 14:32:04 -03:00
audio/client Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl 2017-06-01 16:38:58 -03:00
breakouts Mostly working, still problems with user subs 2017-06-01 10:12:11 -03:00
captions Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl 2017-06-01 16:38:58 -03:00
chat Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl 2017-06-01 16:38:58 -03:00
common/server Merge remote-tracking branch 'upstream/master' into refactor-poll-api 2016-10-24 13:39:37 -02:00
cursor Mostly working, still problems with user subs 2017-06-01 10:12:11 -03:00
deskshare Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl 2017-06-01 16:38:58 -03:00
log-client/server Code refactored 2017-05-31 14:54:43 -03:00
meetings Mostly working, still problems with user subs 2017-06-01 10:12:11 -03:00
polls Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl 2017-06-01 16:38:58 -03:00
presentations Mostly working, still problems with user subs 2017-06-01 10:12:11 -03:00
shapes Mostly working, still problems with user subs 2017-06-01 10:12:11 -03:00
slides Mostly working, still problems with user subs 2017-06-01 10:12:11 -03:00
users Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl 2017-06-01 16:38:58 -03:00