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

13655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
KDSBrowne
4dd268e25a added new suggestions 2016-11-18 21:28:01 -08:00
Anton Georgiev
c98813e7b3 Merge pull request #3460 from mmarangoni/html5-stun-audio 
Mute, Unmute, Leave Audio
 2016-11-18 17:03:13 -05:00
Matthew Marangoni
c9221c94f3 removed unecessary import statements 2016-11-18 13:35:02 -08:00
Matthew Marangoni
aa65afffa4 adjusted to meet component/container structure conventions and simplify code 2016-11-18 13:24:59 -08:00
Oswaldo Acauan
4fe83bf79d Refactor Shapes API 2016-11-18 17:59:11 +00:00
Oswaldo Acauan
b0e784ec60 Merge remote-tracking branch 'upstream/master' into refactor-api-shapes 
* upstream/master:
  Remove wrong commited files
  Refactor API Cursor's
 2016-11-18 17:35:53 +00:00
Oswaldo Acauan
529ff51a72 Refactor Shapes API 2016-11-18 17:35:28 +00:00
Anton Georgiev
9974763bc9 Merge pull request #3473 from oswaldoacauan/refactor-api-cursor 
[HTML5] Refactor API Cursor's
 2016-11-18 11:10:45 -05:00
Oswaldo Acauan
e932bb88fd Remove wrong commited files 2016-11-18 12:28:55 +00:00
Oswaldo Acauan
b4f9d88fac Refactor API Cursor's 2016-11-18 12:26:14 +00:00
Anton Georgiev
e644576063 Merge pull request #3435 from JaeeunCho/messages_v1 
HTML5-client : fixed messages from the logged out users on public-chat
 2016-11-17 16:03:51 -05:00
Anton Georgiev
414ac02ca7 Merge pull request #3471 from oswaldoacauan/fix-presentation-api 
[HTML5] Fix bug related to presentation handlers
 2016-11-17 16:03:36 -05:00
KDSBrowne
bdcc8b9bd6 added new suggestions, need to fix console warning 2016-11-17 12:10:05 -08:00
Oswaldo Acauan
15f59f9781 Fix bug related to presentation handlers 2016-11-17 15:54:24 +00:00
Ghazi Triki
40e16b0002 Use local context instead of the global context for scheduleOnce. 2016-11-17 14:12:41 +01:00
Ghazi Triki
727a671b55 Update schedule period of MonitorNumberOfWebUsers. 2016-11-17 12:12:17 +01:00
Ghazi Triki
ab9f85b852 Delay sending DisconnectAllUsers at EndMeeting handler in akka-bbb-apps to avoid a synchronisation issue noticed when users are streaming using RTMPT. 2016-11-17 11:16:14 +01:00
KDSBrowne
6f1680318c update 2016-11-16 07:15:17 -08:00
Anton Georgiev
b219d21dd0 Merge pull request #3468 from capilkey/1.1-fix-webrtc-error-logging 
Fix exception in webrtc error logging
 2016-11-15 18:32:57 -05:00
Chad Pilkey
cb77ada8f2 fix exception in webrtc error logging 2016-11-15 18:26:36 -05:00
Richard Alam
ee8d7ea504 Merge pull request #3467 from antobinary/heap-monitor 
Add JVM Heap monitor in bbb-apps
 2016-11-15 17:54:47 -05:00
Anton Georgiev
b6cff88bfe change frequency of heap monitor to 60sec 2016-11-15 22:51:39 +00:00
Anton Georgiev
8726ec2914 add JVM Heap monitor updated every 5 sec 2016-11-15 22:42:10 +00:00
Matthew Marangoni
0abcc06bfc linting fixes & updated based on feedback 2016-11-15 13:00:28 -08:00