Commit Graph

23228 Commits

Author SHA1 Message Date
KDSBrowne
14066b4280 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into post-router-style-fix 2018-10-15 14:54:15 +00:00
KDSBrowne
262038520b improve styling / fix bugs 2018-10-15 14:36:26 +00:00
Fred Dixon
b99101fa88
Update bigbluebutton-release 2018-10-15 08:28:16 -04:00
Fred Dixon
c52663bb3f
Merge pull request #6155 from jfederico/recording-ready-update
Updates for backward compatibility to recording-ready-callback script
2018-10-13 18:57:06 -04:00
Fred Dixon
7ccdf1fdae
Merge pull request #6156 from jfederico/bbb-lti-preview-bug
Fix for bug in preview not working for students
2018-10-13 18:56:15 -04:00
jfederico
54a14f8cb7 Fix for bug in preview not working for students 2018-10-12 21:52:39 +00:00
jfederico
bb078aab20 Updates for backward compatibility to recording-ready-callback script 2018-10-12 21:41:37 +00:00
Bobak Oftadeh
65276a5423 Altered user manage button styles 2018-10-12 14:19:30 -07:00
Anton Georgiev
717a1e2db2 recovered logout functionality including feedback 2018-10-12 21:14:28 +00:00
Chad Pilkey
a21325e3ef
Merge pull request #6154 from capilkey/increase-ice-negotiation-timeout
Increase the ICE negotiation timeout from 5 to 10s
2018-10-12 16:27:15 -04:00
Chad Pilkey
8df89ceb78 increase the ICE negotiation timeout from 5 to 10s 2018-10-12 13:26:51 -07:00
Maxim Khlobystov
393c940959 Cleanup. 2018-10-12 14:56:42 -04:00
Maxim Khlobystov
05e7c56351 Prevent linter from ignoring the test files + some linting. 2018-10-12 14:46:26 -04:00
Anton Georgiev
27a41753f9 hooked on error pages via Session 2018-10-12 17:05:30 +00:00
Bobak Oftadeh
21b84a5303 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-12 09:17:19 -07:00
KDSBrowne
9b42940d63 move polling options for viewer 2018-10-12 15:05:53 +00:00
Bobak Oftadeh
52aa4fd3c1 Mute meeting functionality implemented 2018-10-11 14:27:56 -07:00
Chad Pilkey
1c33203abd
Merge pull request #6151 from capilkey/fix-ss-option-tooltips
Fix the tooltips for the screenshare type buttons
2018-10-11 16:49:58 -04:00
Chad Pilkey
237020d726 fix the tooltips for the screenshare type buttons 2018-10-11 13:46:43 -07:00
Anton Georgiev
4059fd5fa9 mostly recovered chat. needs UI love and handling of unread 2018-10-11 20:41:37 +00:00
Ghazi Triki
424a3ffde6 Log exception stack trace in presentation conversion classes using error scope. 2018-10-11 20:06:42 +01:00
Anton Georgiev
1f2c81d7b9
Merge pull request #6144 from prlanzarin/sfu-kms-ws-pool
Make bbb-webrtc-sfu connect to Kurento using multiple websockets and other assorted improvements
2018-10-11 14:59:45 -04:00
prlanzarin
e83e881f77 Added edge case to error handling on base classes and SFU pipeline cleanup on room empty 2018-10-11 18:54:09 +00:00
prlanzarin
7f3d3c0d32 Fixed reconnecting webcam viewers and session overlaps 2018-10-11 18:23:26 +00:00
Anton Georgiev
a815433fb0
Merge pull request #6143 from gustavotrott/master
Adds compatibility with Electron Chromium to choose one screen to share
2018-10-11 13:11:52 -04:00
Maxim Khlobystov
97ebd02595
Merge pull request #6090 from jfsiebel/ini-configuration-file
Remove settings and use yml file
2018-10-11 13:03:48 -04:00
Richard Alam
1a9e6486c9
Merge pull request #6147 from ritzalam/add-metrics-to-get-recordings-api
Return some data metrics on get recordings api
2018-10-11 10:52:14 -04:00
gustavotrott
4f607d304a Move duplicated parameters to a constant in the beginning 2018-10-11 10:24:12 -03:00
KDSBrowne
bc5592ef67 update css styles 2018-10-11 03:20:58 +00:00
KDSBrowne
a955a7c0f1 replace createContainer with withTracker 2018-10-11 03:01:59 +00:00
Richard Alam
dd82d95022
Merge pull request #6148 from riadvice/fix-doc-conversion
Add process handler to image conversion in SvgImageCreatorImp.java
2018-10-10 17:36:04 -04:00
Ghazi Triki
1ffccb273d Add process handler to image conversion in SvgImageCreatorImp.java 2018-10-10 21:44:24 +01:00
KDSBrowne
dc8bd0345d edit live-result style values 2018-10-10 19:04:09 +00:00
Richard Alam
f780a43c44 - implement data metrics on metadata.xml 2018-10-10 11:38:31 -07:00
KDSBrowne
5654f08b43 clean up code 2018-10-10 18:25:35 +00:00
KDSBrowne
7673adee1b implement live results for poll 2018-10-10 15:52:39 +00:00
Anton Georgiev
c661d0a8df
Merge pull request #6145 from prlanzarin/webrtc-update-followup
Added onunmute listener to MediaStreamTrack
2018-10-10 10:59:24 -04:00
prlanzarin
16bfcb9f19 Making further use of the SFU-KMS websocket pool by making the kurento adapter a bit more stateless 2018-10-09 22:12:38 +00:00
Maxim Khlobystov
5b0ea85ba6 Getting the Docker-related files from a remote repo + some code cleanup. 2018-10-09 16:20:21 -04:00
prlanzarin
5dd8a3d3c4 Added onunmute listener to MediaStreamTrack to detect late start tracks 2018-10-09 18:03:40 +00:00
prlanzarin
a7da78086f Make SFU connect to Kurento using multiple websockets 2018-10-09 16:59:42 +00:00
prlanzarin
27b1bca1e9 Unified SFU media server state code and fixed some issues with it 2018-10-09 16:55:15 +00:00
prlanzarin
db12a4f06d Added comments explaning SFUs config params and a new websocket pool config 2018-10-09 16:54:18 +00:00
Richard Alam
87098e7b6b
Merge pull request #6088 from ritzalam/improve-log-on-presentation-conversion
Improve handling of slides failing to load (tomcat memory issues)
2018-10-09 12:17:32 -04:00
Richard Alam
ca9fa5dc09 - changing aliases to use meeting_id_2 instead of meeting_id_1 just in case we need to make the URL params different 2018-10-09 09:15:22 -07:00
Richard Alam
f05cb7ddbc Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-log-on-presentation-conversion 2018-10-09 09:13:03 -07:00
Richard Alam
44650ca104
Merge pull request #6141 from riadvice/end-callback-recordings
Add "recordingmarks" to end meeting callback url
2018-10-09 12:07:45 -04:00
Richard Alam
5e6c59a52c
Merge pull request #6134 from riadvice/improve-svg-conversion
Updated SVG conversion to simplify complex files
2018-10-09 11:50:54 -04:00
Anton Georgiev
5a9c43731f
Merge pull request #6128 from prlanzarin/lo-improv
Improvements to Safari WebRTC interop and SFU listen only
2018-10-09 09:46:16 -04:00
gustavotrott
265275018e Added compatibility with Electron Chromium 2018-10-09 10:43:22 -03:00