BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,692 Commits 13 Branches 260 Tags 1.1 GiB
903ba22713
Commit Graph

13692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fred Dixon
f0a7f23535 Merge pull request #3486 from ffdixon/fix-bigbluebutton-properties 
Removed carriage returns from bigbluebutton.properties
 2016-11-28 18:22:49 -05:00
Fred Dixon
21b953bc7c Removed carriage returns from bigbluebutton.properties 2016-11-28 17:21:36 -06:00
gcampes
470b6e08c1 Change breakout code 2016-11-28 17:48:02 -02:00
Anton Georgiev
e1f63c0aec make function export default 2016-11-28 19:36:58 +00:00
Anton Georgiev
7f9228ac02 fix Meteor.Error 2016-11-28 19:36:06 +00:00
Anton Georgiev
929ac08acb Merge branch 'OpenSettings-Menu-Options' of github.com:KDSBrowne/bigbluebutton into kert-pres-2 2016-11-28 19:17:15 +00:00
gcampes
64bbb092b2 Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master:
  - close port testing connection
  - upgrade to latest red5
  - minor formatting from IDE
 2016-11-25 14:22:45 -02:00
KDSBrowne
0fc3883397 removed duplication 2016-11-25 08:07:41 -08:00
gcampes
b3c9d60182 Redo some breakouts code 2016-11-25 14:06:36 -02:00
KDSBrowne
b52d06fd85 fixed lint issue 2016-11-25 05:11:50 -08:00
KDSBrowne
59ded8461e added suggestions 2016-11-24 20:00:46 -08:00
Richard Alam
a576ba3fbd Merge pull request #3484 from ritzalam/upgrade-red5-nov-22-2016-snapshot 
Upgrade red5 nov 22 2016 snapshot
 2016-11-24 18:02:41 -05:00
Richard Alam
145c40a459 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into upgrade-red5-nov-22-2016-snapshot 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
 2016-11-24 23:00:56 +00:00
gcampes
f75c73b4e6 Polish breakout rooms code 2016-11-24 17:22:04 -02:00
KDSBrowne
4078337569 removed console logs 2016-11-23 18:12:36 -08:00
KDSBrowne
d580f01efd fixed lint issues 2016-11-23 18:01:51 -08:00
KDSBrowne
525279ecb0 added moderator condition 2016-11-23 17:55:14 -08:00
KDSBrowne
f5d82b8d38 Shows main setting options based on role 2016-11-23 12:01:09 -08:00
gcampes
7001ec59fc Adds correct handling for breakouts update 2016-11-23 14:18:36 -02:00
gcampes
1ba90598f6 Fix timer for breakouts 2016-11-23 14:13:41 -02:00
gcampes
655f8dd6d6 Fix merge conflicts 2016-11-23 13:33:51 -02:00
gcampes
0aa6022c89 Changes breakout code to handle the new message format 2016-11-23 13:32:04 -02:00
Richard Alam
5f56a4edcd - close port testing connection 2016-11-22 20:46:29 +00:00
Richard Alam
8f6213b77d - upgrade to latest red5 2016-11-22 20:45:58 +00:00
Richard Alam
224114c83d Merge pull request #3424 from riadvice/logout-on-stop-recording 
New option to logout user when he stops the recording
 2016-11-22 13:40:41 -05:00
Richard Alam
68e6060166 Merge pull request #3476 from riadvice/request-join-url-update 
RequestBreakoutJoinURL returns two join urls
 2016-11-22 13:39:18 -05:00
Richard Alam
7242b90412 Merge pull request #3470 from riadvice/monitoring-schedule-period 
Update schedule period of MonitorNumberOfWebUsers.
 2016-11-22 13:38:40 -05:00
Richard Alam
c9be893d5c Merge pull request #3469 from riadvice/delay-disconnecting-users-at-end-meeting 
Delay sending DisconnectAllUsers at EndMeeting handler in akka-bbb-apps
 2016-11-22 13:38:24 -05:00
Anton Georgiev
902d92f60e Merge pull request #3481 from antobinary/play-audio-sample 
Play audio sample; Add audio icon talking feedback
 2016-11-22 13:30:14 -05:00
Oswaldo Acauan
19a81e1d90 Add visual indicator when someone is talking 2016-11-22 18:26:01 +00:00
Anton Georgiev
fdb4decaf7 cleanup 2016-11-22 16:16:13 +00:00
Anton Georgiev
5635f94789 refactor updateVoiceUser.js 2016-11-22 16:15:42 +00:00
Richard Alam
faa2e35307 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into upgrade-red5-nov-22-2016-snapshot 2016-11-22 15:59:55 +00:00
Richard Alam
3ead2b449b - minor formatting from IDE 2016-11-22 15:59:05 +00:00
gcampes
e14c9159df Fix breakout closing issues 2016-11-22 13:46:08 -02:00
Anton Georgiev
462d72afa0 handle talking event in html5 2016-11-22 15:06:54 +00:00
Anton Georgiev
8442a4bda0 cleanup 2016-11-21 21:10:20 +00:00
Anton Georgiev
d3ec5c187a play audio file to test speakers/audio output 2016-11-21 21:06:19 +00:00
Richard Alam
550d8c5337 Merge pull request #3477 from kepstin/video-info-typo 
Fix typo in recording sanity script.
 2016-11-21 15:31:59 -05:00
Richard Alam
09b5d7dc3c Merge pull request #3478 from ritzalam/remove-executor-in-transcoder 
- do not use another thread to do the transcoding. The thread doesn'…
 2016-11-21 15:19:34 -05:00
Richard Alam
9f383c9799 - do not use another thread to do the transcoding. The thread doesn't get cleaned up when the call ends 
and the thread is waiting for packet in the queue. I am noticing a lot of threads hanging around
   in Yourkit from the mem dump. Not sure if this is contributing to OOM.
 2016-11-21 20:14:47 +00:00
Calvin Walton
bd8baed660 Fix typo in recording sanity script. 
This caused it to think all video files were corrupt.
 2016-11-21 15:01:54 -05:00
Anton Georgiev
924eaa17c3 Merge pull request #3445 from KDSBrowne/Lock-Settings-Availability 
Lock settings available to Presenter/Moderator
 2016-11-21 14:07:11 -05:00
Anton Georgiev
ba7e69333c Merge pull request #3475 from oswaldoacauan/refactor-api-shapes 
[HTML5] Refactor API Shapes (whiteboard)
 2016-11-21 13:38:03 -05:00
Ghazi Triki
59a0f4665d Updated RequestBreakoutJoinURL to return two join urls, the first with redirection enable and the second without redirection. 2016-11-21 18:01:22 +01:00
Oswaldo Acauan
bf99bb50d4 Clear shapes after clearing an presentation 2016-11-21 16:04:42 +00:00
KDSBrowne
2e3407e128 clean up - more readable 2016-11-21 06:32:12 -08:00
gcampes
bdb6780f7a Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master:
  removed unecessary import statements
  adjusted to meet component/container structure conventions and simplify code
  Remove wrong commited files
  Refactor API Cursor's
  Fix bug related to presentation handlers
  linting fixes & updated based on feedback
  HTML5-clent messages on chat - changed icon for logged out users
  fixed an error with exit audio
  Added mute/unmute/join listen only/leave audio features to join audio modal
  HTML5-client messages for logged out user on chat
  HTML5-clent messages on chat
 2016-11-21 10:53:55 -02:00
KDSBrowne
4dd268e25a added new suggestions 2016-11-18 21:28:01 -08:00