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
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
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
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
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
Lucas Fialho Zawacki
e3b0578c49
Small fixes to recording code
2018-05-17 16:58:06 +00:00
Tainan Felipe
f2c23b2e19
Fix intl translation
2018-05-17 11:46:25 -03:00
Tainan Felipe
b77e5494e0
add error message for when media server is offline and fix decrtion of intl message
2018-05-17 10:23:18 -03:00
Fred Dixon
4c87db1c2d
Merge pull request #5551 from capilkey/imp-ss-select
...
Redesign of screenshare select with win10 chrome warning
2018-05-17 07:25:47 -04:00
Chad Pilkey
8fc80492b6
redesign of screenshare select with win10 chrome warning
2018-05-16 20:01:34 -07:00
Tainan Felipe
1d348c0328
Remove log
2018-05-16 15:30:40 -03:00
Tainan Felipe
8b1eda92b6
Create intlMediaErrorsMessages and add messages of errors
2018-05-16 15:16:12 -03:00
Tainan Felipe
0c16518025
add specific messages to permissions errors
2018-05-16 14:12:57 -03:00
Fred Dixon
b0e8f04217
Merge pull request #5547 from kepstin/bbb-20-rec-fixes
...
RaP: Scale to a square when generating slide images for pres. format
2018-05-16 12:00:24 -04:00
Calvin Walton
36a6b0f5ac
RaP: Scale to a square when generating slide images for pres. format
...
This improves the quality of portrait documents, before they were
1200px when landscape documents got 1600px.
Switching to scaling to a square means that we can use the "-scale-to"
option on pdftocaio, which means that it generates images directly
at the desired size. This can save quite a bit of time (and memory)
if a document was uploaded with extremely large page size.
2018-05-16 11:54:35 -04:00