Commit Graph

19125 Commits

Author SHA1 Message Date
Ghazi Triki
8129f67879 Add missing class SetWebcamsOnlyForModeratorEvent. 2018-01-07 16:46:16 +01:00
Ghazi Triki
38ab186b53 Change webcamsOnlyForModerator property and handle saving it in server and client. 2018-01-07 16:45:24 +01:00
Anton Georgiev
d22a6d5a96
Merge pull request #4883 from OZhurbenko/fix-issue-4863
Updated the message displayed to the kicked user
2018-01-04 14:20:00 -02:00
Anton Georgiev
850ac870e9
Merge pull request #4884 from OZhurbenko/fix-issue-4715
Updated the html5 client's font to use the latest icons
2018-01-04 13:30:36 -02:00
Anton Georgiev
a00487cc75
Merge pull request #4740 from Tainan404/fix-dropdown-bug
Fix user list dropdown bug when making user presenter.
2018-01-03 19:40:49 -02:00
Anton Georgiev
34a503b218
Merge pull request #4624 from Tainan404/toast-breakout-ends
[HTML5] show audio modal and toast notification when breakout room ends
2018-01-03 19:11:27 -02:00
Oleksandr Zhurbenko
b3ceb4d5f6 Updated the html5 client's font to use the latest icons
Fixes #4715
2018-01-03 12:35:01 -08:00
Oleksandr Zhurbenko
d8533a86b3 Changed the message displayed to the kicked user
Fixes #4863
2018-01-03 12:25:13 -08:00
Anton Georgiev
830627ea0c
Merge pull request #4831 from OZhurbenko/presenter-functionality-2x
Improved Whiteboard toolbar's user experience
2018-01-03 14:47:02 -02:00
Anton Georgiev
5debc39362
Merge pull request #4818 from antobinary/fix-ios-audio
Add permissionLayout location for Safari
2018-01-03 14:46:19 -02:00
Anton Georgiev
f0e15af607
Merge pull request #4814 from oswaldoacauan/issue-4812
Simplify authentication code/flow and Add subscriptions error handling
2018-01-03 14:45:38 -02:00
Fred Dixon
3997caaccd
Merge pull request #4871 from riadvice/breakout-room-fix-v2.0
Disable private chat for breakout rooms
2017-12-30 10:43:32 -04:00
Ghazi Triki
cc2f2708e3 Add a new configuration option privateChateEnabled for breakout rooms. 2017-12-29 15:51:35 +01:00
Ghazi Triki
2147f8e454 Disable private chat in breakout rooms. 2017-12-29 09:44:30 +01:00
Ghazi Triki
4bf5a26ecf Fix setters in Meeting.java 2017-12-29 09:44:16 +01:00
Oleksandr Zhurbenko
6c9af5c2ed
Merge pull request #4867 from lfzawacki/bbb-webrtc-sfu
Fix problem when building HTML5 screenshare + video PR
2017-12-22 16:42:07 -05:00
Lucas Zawacki
2e323c809a Put rid dependency in production part of package.json 2017-12-22 18:46:00 -02:00
Richard Alam
f108ecb1d8
Merge pull request #4866 from antobinary/test-4661
Adjust Meeting structure to contain new property muteOnStart
2017-12-22 12:27:03 -08:00
Anton Georgiev
c9379eaa0f add muteOnStart param in Meeting structure 2017-12-22 15:22:24 -05:00
Anton Georgiev
61c12298e2
Merge pull request #4661 from prlanzarin/bbb-webrtc-sfu
Add support for WebRTC screensharing into Flash/HTML5 and WebRTC video into HTML5
2017-12-22 14:43:38 -02:00
Anton Georgiev
0515166405 Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into test-4661 2017-12-22 10:54:46 -05:00
prlanzarin
31fb95bf72 Removed wrong video peer stop procedure and reset the kurento.yaml config file 2017-12-22 12:30:24 +00:00
Richard Alam
3264f8a7d5 Merge branch 'capilkey-breakout-room-closing-warning' into v2.0.x-release 2017-12-21 13:13:28 -08:00
Richard Alam
763c2c51c0 - remove trace log 2017-12-21 13:12:58 -08:00
Richard Alam
becf60b389 Merge branch 'breakout-room-closing-warning' of https://github.com/capilkey/bigbluebutton into capilkey-breakout-room-closing-warning 2017-12-21 12:52:50 -08:00
Chad Pilkey
5b367f6101 add a minute warning when breakout rooms are going to close 2017-12-21 15:13:52 -05:00
Richard Alam
fb214b1370
Merge pull request #4862 from ritzalam/change-ejected-msg
Change ejected msg
2017-12-21 11:13:35 -08:00
Richard Alam
4d75664ca2 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into change-ejected-msg 2017-12-21 11:12:15 -08:00
Richard Alam
d13b01def7 - change all kick works to remove 2017-12-21 11:11:32 -08:00
Richard Alam
d1ddbd091b
Merge pull request #4861 from ritzalam/set-mute-on-start
- implement muteOnstart by passing on create API or using bigbluebut…
2017-12-21 10:56:41 -08:00
Richard Alam
78afb91562 - implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml 2017-12-21 10:40:44 -08:00
prlanzarin
8608fd9f94 Tooltips for video buttons and actions-bar container service calls fixes 2017-12-21 17:40:00 +00:00
prlanzarin
51b62ed30d Added checking for HTML5 webcams
This should prevent blank webcams on the flash client
2017-12-21 17:38:39 +00:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00:00
Richard Alam
bc5df11915
Merge pull request #4857 from ritzalam/custom-copyright
- allow to pass custom copyright text using create API
2017-12-20 14:30:44 -08:00
Richard Alam
d09abe92e4 - allow to pass custom copyright text using create API 2017-12-20 14:28:01 -08:00
Richard Alam
00140f0cca
Merge pull request #4852 from ritzalam/all-custom-log
- allow passing of custom param (logo) to override default logo
2017-12-20 13:32:11 -08:00
Richard Alam
b8af2fd5ee Merge branch 'riadvice-fix-mute-meeting' into v2.0.x-release 2017-12-20 13:31:24 -08:00
Richard Alam
64a9cbfea1 - users come in as always unmuted, so no need to check muted flag 2017-12-20 13:30:35 -08:00
Lucas Zawacki
06f8b56a82 Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-video-media-flow
Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-20 18:43:33 -02:00
Lucas Zawacki
7df986da3d Use more readable uids for bbb-webrtc-sfu 2017-12-20 18:23:56 -02:00
prlanzarin
362335f727 Made the users own webcam local instead of server-side 2017-12-20 20:06:27 +00:00
Lucas Zawacki
113aca16a2 Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-development-reconnect-issues
Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	labs/bbb-webrtc-sfu/lib/video/VideoManager.js
	labs/bbb-webrtc-sfu/lib/video/video.js
2017-12-20 17:20:56 -02:00
Richard Alam
f5502a1a2a - allow passing of custom param (logo) to override default logo 2017-12-20 11:06:00 -08:00
prlanzarin
2fb291cec2 Fixed video session management on bbb-webrtc-sfu
This should solve the most severe cases of ghost webcams
2017-12-20 18:01:27 +00:00
prlanzarin
0cecd028fd Changing the way the unshare webcam API is called to support user roles 2017-12-20 18:00:17 +00:00
Lucas Zawacki
2e3ea4e45f Better video stop treatment in HTML5 2017-12-20 15:05:05 -02:00
Lucas Zawacki
0974c69d48 Small fixes on the server and iceCandidate sending 2017-12-20 14:56:28 -02:00
Ghazi Triki
276e9e2f5f Fix put meeting and at muted status. 2017-12-20 17:32:10 +01:00
Richard Alam
58d8e70303
Merge pull request #4844 from ritzalam/fix-logouttimer-and-mod-only-msg
- hardcode logoutTimer to zero as we don't use this feature in the r…
2017-12-20 07:37:12 -08:00