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

20600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Jung
f7b1524114 Adjust the default size of userList and chat 2018-05-24 13:32:31 -04:00
KDSBrowne
e0a07a4f23 remove the use of setTimeout 2018-05-24 09:04:16 -07:00
KDSBrowne
65c9ebbdf7 rename functions / add comment 2018-05-24 08:47:42 -07:00
James Jung
bf63679ed8 Set default width of userList and change the unit of the userList width size from percentage to pixel 2018-05-23 14:21:48 -04:00
Richard Alam
9eec0ffa89 Merge branch 'riadvice-breakout-room-server-expiry' into v2.0.x-release 2018-05-23 11:08:48 -07:00
Richard Alam
6323289cbb - no need to log 2018-05-23 11:08:11 -07:00
Lucas Fialho Zawacki
3d92f252b6 Try to make sure that attach streams and stream restarts always work 2018-05-23 18:04:47 +00:00
Lucas Fialho Zawacki
6cae1678ef Separate webrtc errors, restart and ice in separate functions 2018-05-23 18:04:01 +00:00
Lucas Fialho Zawacki
b7b5230966 Only send camera share to api after sharer has received a play start 2018-05-23 17:54:26 +00:00
Lucas Fialho Zawacki
5433049ab7 Better handle visibility events and paused streams 2018-05-23 17:54:16 +00:00
Richard Alam
69528a0d43 Merge branch 'breakout-room-server-expiry' of https://github.com/riadvice/bigbluebutton into riadvice-breakout-room-server-expiry 2018-05-23 10:39:39 -07:00
Richard Alam
126bb62d7d Merge branch 'riadvice-recording-timer' into v2.0.x-release 2018-05-23 10:33:17 -07:00
Richard Alam
4eb86bfb52 - format 2018-05-23 10:32:51 -07:00
Richard Alam
39558cd805 Merge branch 'recording-timer' of https://github.com/riadvice/bigbluebutton into riadvice-recording-timer 2018-05-23 10:11:09 -07:00
Richard Alam
db6b2a18f5
Merge pull request #5579 from kepstin/bbb-20-rec-fixes 
RaP: Merge the sanity script from master branch
 2018-05-23 13:00:27 -04:00
Richard Alam
b3b9411587
Merge pull request #5575 from ritzalam/shorten-reconn-timer 
- shorten timer to wait in case other red5 conn disconnect. Need to …
 2018-05-23 13:00:02 -04:00
Lucas Fialho Zawacki
09166db2c9 Rename variable in WebRTCDesktopPublishWindow.mxml 2018-05-23 16:32:00 +00:00
Ghazi Triki
eab45f7fa5 Fix event name typo. 2018-05-23 17:26:05 +01:00
Augusto Bennemann
77a25940e0
Comment out screenshare code for Safari 2018-05-23 13:04:03 -03:00
Calvin Walton
7d643f9bf8 RaP sanity: Don't delete .ser file unless repair succeeded 2018-05-23 12:03:20 -04:00
Richard Alam
316986bf1d
Merge pull request #5570 from ritzalam/put-back-screenshare-stop-reason 
- put back accidentally deleted log to show why screenshare failed t…
 2018-05-23 11:23:35 -04:00
Richard Alam
f48f286441
Merge pull request #5571 from ritzalam/allow-region-default-screenshare 
- allow to configure using config.xml that region is default choice …
 2018-05-23 11:23:17 -04:00
Calvin Walton
9cdafbdfe7 RaP: Merge the sanity script from master branch 
Due to improvements in the recording scripts, most of the stuff the sanity
script was checking for is no longer needed (missing/corrupt video files
are handled by the processing scripts). The version of this script in
master has been cleaned up so that the only things it does are:

- Check that the events.xml exists and is properly formatted xml
- Rebuild flv files from red5 .flv.ser/.flv.info files

The script from master is compatible with the 2.0 code, so just use it
as-is.

This fixes a problem where following the recent red5 upgrade in 2.0 branch,
an flv file is never written for webcam streams where no frames were
received, despite there being recording events.
 2018-05-23 11:18:04 -04:00
Richard Alam
17f228fba9 - make reconnect wait timer configurable. This timer waits for a period of time in case other connections 
disconnects before initiating reconnection. Default is 2 seconds.
 2018-05-23 08:13:34 -07:00
Richard Alam
46a00dc82f - fix issue where meeting ends when only or last user auto-reconnects 2018-05-23 08:09:51 -07:00
Ghazi Triki
4eebdf00fa Add a new message RecordAndClearPreviousMarkersCmd. 2018-05-23 16:09:15 +01:00
Richard Alam
ffd4347867 - shorten timer to wait in case other red5 conn disconnect. Need to initiate reconnect as soon as possible. 2018-05-22 13:38:44 -07:00
KDSBrowne
a750e2b2a0 edit config prop / startup-server-index variable names 2018-05-22 12:57:43 -07:00
Augusto Bennemann
68c18ff70f Display a toast for screensharing not supported by Safari 2018-05-22 14:17:35 -03:00
Ghazi Triki
a4fef6ff8a Fix server recording timer and correctly save MettingState2x 2018-05-22 18:07:06 +01:00
Augusto Bennemann
384b912995
Fix error logging 2018-05-22 12:42:51 -03:00
Richard Alam
414498d0d2 - allow to configure using config.xml that region is default choice for JWS screenshare 2018-05-22 07:51:14 -07:00
Anton Georgiev
bf5a22a13f
Merge pull request #5549 from Tainan404/issue-5439 
Tested, works well
 2018-05-22 10:37:55 -04:00
Richard Alam
f2330333d6 - put back accidentally deleted log to show why screenshare failed to start 2018-05-22 07:02:14 -07:00
Fred Dixon
6468ac3459
Merge pull request #5567 from capilkey/ff60-fileupload-warning 
Add a 64-bit check to the Firefox 60+ upload block
 2018-05-20 12:31:26 -04:00
Chad Pilkey
6d0e00a109 add a 64-bit check to the Firefox 60+ upload block 2018-05-20 09:25:36 -07:00
Fred Dixon
cfc6320a50
Merge pull request #5566 from capilkey/ff60-fileupload-warning 
Temporarily disable uploading on Win Firefox 60+
 2018-05-19 21:19:51 -04:00
Chad Pilkey
f2025b658b temporarily disable uploading on Win FF60+ 2018-05-19 18:16:42 -07:00
Fred Dixon
4bfe83e88f
Merge pull request #5565 from ritzalam/fix-ff-upload 
- add some kind of check to uploaded file
 2018-05-19 17:14:11 -04:00
Richard Alam
0361f1c5db - add some kind of check to uploaded file 
NOTE: This doesn't fix issue with uploading file with FF 60 on Windows 10.
 2018-05-19 10:01:22 -07:00
Richard Alam
ef60beec7c - update the state to keep recording timer updated 2018-05-18 11:35:30 -07:00
Ghazi Triki
634635c8cd Update recording confirmation window and add recording timer (Work In Progress) 2018-05-18 15:58:08 +01:00
Tainan Felipe
2fc98a4645 add redirect to chat in toast notification 2018-05-18 08:54:26 -03:00
James Jung
9b8005f5b9 Add margin to the right side of the chatName to make a small gap between the chatName and the un-read message counter 2018-05-17 16:18:59 -04:00
James Jung
e8b2d80842 Adjust minWidth of resizable user-list to make the user names on the list look better 2018-05-17 16:16:48 -04:00
Chad Pilkey
b2ddfa2f8e
Merge pull request #5557 from ritzalam/only-one-screenshare-connection 
- webrtc screenshare should not create another connection to red5 sc…
 2018-05-17 16:06:04 -04:00
Richard Alam
e72ed00a6c - webrtc screenshare should not create another connection to red5 screenshare app 2018-05-17 12:53:44 -07:00
Augusto Bennemann
e8c2e1219c Fix measure name 2018-05-17 15:08:27 -03:00
Augusto Bennemann
5f142fa793 Fix merge conflicts 2018-05-17 14:49:35 -03:00
Lucas Fialho Zawacki
e3b0578c49 Small fixes to recording code 2018-05-17 16:58:06 +00:00