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

1861 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
bb72cb7b65 Adjusted the pull request to the recent changes 2018-01-15 12:59:09 -08:00
Oleksandr Zhurbenko
f6ed7c3575 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4897 2018-01-15 12:33:29 -08:00
Anton Georgiev
1e25a6d4e1
Merge pull request #4955 from prlanzarin/video-upstream-errors 
WebRTC media updates
 2018-01-15 14:40:53 -02:00
Anton Georgiev
ddfc5e5248
Merge pull request #4846 from Tainan404/fix-settings-mobile 
Change modal settings styles.
 2018-01-15 13:22:56 -02:00
prlanzarin
acc9650370 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-upstream-errors 2018-01-12 21:39:24 +00:00
prlanzarin
f54214c4e1 Merge remote-tracking branch 'mconftec/disable-share-webcam-button' into video-upstream-errors 2018-01-12 21:31:01 +00:00
prlanzarin
8594ce169d Merge remote-tracking branch 'mconftec/fixes-lucas' into video-upstream-errors 2018-01-12 20:02:45 +00:00
Lucas Fialho Zawacki
0d3466a1db Use service joinedVideo in the correct stage of video sharing flow 2018-01-12 19:44:56 +00:00
Lucas Fialho Zawacki
68abf367d0 Prevent errors on html5 video when socket disconnects 2018-01-12 19:37:05 +00:00
Lucas Fialho Zawacki
cdb961f724 Wait one tick before resizing HTML5 videos 2018-01-12 19:36:23 +00:00
Lucas Fialho Zawacki
ce7d720a13 Fix problems on video tags if camera is busy 2018-01-12 19:36:15 +00:00
Lucas Zawacki
552b2ab665 Detect online/offline browser and open/close WS accordingly 2018-01-12 19:36:07 +00:00
prlanzarin
67f297dd95 Removed unused screenshare container from videodock and fixed stop message userId 2018-01-12 18:51:07 +00:00
prlanzarin
4fc1e3ea85 Fixed incorrect fetching of userId in the video-dock component 2018-01-12 18:39:16 +00:00
Anton Georgiev
4ecc54ac29
Merge pull request #4801 from Tainan404/fix-moderator-ends 
Add screen to when the meeting is closed.
 2018-01-11 14:02:13 -02:00
Tainan Felipe
8ae1fd1820 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends 2018-01-11 09:19:56 -02:00
Augusto Bennemann
a8888e49ad Prevent multiple clicks on share/unshare video button 2018-01-10 23:16:49 -02:00
Tainan Felipe
5e96068a6d remove multiplication for 1 2018-01-10 16:55:33 -02:00
Tainan Felipe
273ea0dbc6 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-settings-mobile 2018-01-10 16:42:39 -02:00
Oleksandr Zhurbenko
7871681448 Changed all the references of kick to remove, to be consistent 2018-01-09 14:28:48 -08:00
Anton Georgiev
a2ff3e6480 remove AudioComponent as we do not render anything 2018-01-09 17:07:29 -05:00
Anton Georgiev
e9093a6c19 Merge branch 'v2.0.x-release' into fix-audio-locale-change 2018-01-09 14:52:49 -05:00
Anton Georgiev
0c8be1cc0b
Merge pull request #4833 from KDSBrowne/x.0.4-ios-hide-fullscreen 
Hide fullscreen option for iOS devices
 2018-01-09 13:29:53 -02:00
Anton Georgiev
980a6490ec
Merge pull request #4832 from KDSBrowne/x.0.3-fix-console-warnings 
Fix Invalid prop 'children[2]' supplied to `DropdownList`
 2018-01-09 13:28:17 -02:00
Anton Georgiev
0392634f57
Merge pull request #4841 from MaximKhlobystov/reopen-private-chat-bug 
[HTML5 Client] Fix for reopening private chat after using X button
 2018-01-08 18:42:36 -02:00
Oleksandr Zhurbenko
ce1f40ac9a Updated Meteor to 1.6.0.1 2018-01-07 22:17:18 -08:00
Oleksandr Zhurbenko
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -08:00
Augusto Bennemann
e2ef3281ec Localize video and screnshare error messages 2018-01-05 19:43:53 +00:00
Augusto Bennemann
67cb4b073b Error notifications for video and screenshare 2018-01-05 17:16:46 +00: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
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
d8533a86b3 Changed the message displayed to the kicked user 
Fixes #4863
 2018-01-03 12:25:13 -08:00
KDSBrowne
3fd964d3ca remove import not being used 2018-01-03 09:04:28 -08:00
KDSBrowne
ed3d58f0f2 Merge remote-tracking branch 'upstream/v2.0.x-release' into x.0.3-fix-console-warnings 2018-01-03 08:56:22 -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
prlanzarin
31fb95bf72 Removed wrong video peer stop procedure and reset the kurento.yaml config file 2017-12-22 12:30:24 +00:00
prlanzarin
8608fd9f94 Tooltips for video buttons and actions-bar container service calls fixes 2017-12-21 17:40:00 +00:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00: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
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
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
4aac6d8413 Tweaks on the video media flow 2017-12-20 00:32:31 -02:00
Lucas Zawacki
1f5dd6f9a7 Move WS open/close events to component mount/unmount 2017-12-19 15:02:54 -02:00
Lucas Zawacki
afe4057bf2 Refactor html5 video tag creation to work with React style 2017-12-19 14:29:09 -02:00
KDSBrowne
1afe2f96bf add comment 2017-12-19 08:23:40 -08:00
Tainan Felipe
523caf226d fix settings for mobile screen 2017-12-19 09:13:37 -02:00