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

2562 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
946c731471 Fixed pencil rendering during the race condition between clear annotations and pencil's draw_end message 2018-01-22 15:07:29 -08:00
Ghazi Triki
5227217e85 Fix the regex that checks the Flash stream id by adding the option "-recorded" to the pattern, making sure recorded streams are matched too. 2018-01-20 09:34:11 +01:00
Maxim Khlobystov
1eddc2f408
Merge pull request #4971 from OZhurbenko/fix-issue-4954 
Aligned the dropdown's close button on small screens
 2018-01-19 16:08:35 -05:00
Joao Siebel
a42d88250e Resolve merge conflict in english locales file 2018-01-19 17:43:11 -02:00
Anton Georgiev
9b16ae8d51
Merge pull request #4938 from KDSBrowne/z.0.1-mobile-btn-alignmet 
Fix alignment of ActionsBar buttons for small screens
 2018-01-18 16:34:27 -02:00
Anton Georgiev
9c101b73f2
Merge pull request #4976 from gutobenn/4955-changes 
Adjusts on screenshare button and requested changes
 2018-01-18 16:33:49 -02:00
KDSBrowne
745f79ba51 make breakpoint range start from 0em 2018-01-18 09:41:52 -08:00
Augusto Bennemann
975525fe9b Fix keys usage on actions-dropdown 2018-01-17 19:51:33 -02:00
Anton Georgiev
9e45091e30
Merge pull request #4980 from KDSBrowne/z.0.4-btn-background-disappear-fix 
Edit css to prevent disappearing close btn background
 2018-01-17 18:29:03 -02:00
Anton Georgiev
7e4a9eda5d
Merge pull request #4979 from KDSBrowne/z.0.5-style-removedUser-view 
Fix broken view styles displayed on error, on meetingEnd and for removed users
 2018-01-17 17:45:31 -02:00
Augusto Bennemann
10cdd603bc Fix null child element 2018-01-17 11:34:35 -02:00
Augusto Bennemann
5bf96b3c84 Screenshare button conditional rendering 2018-01-17 01:17:07 -02:00
Augusto Bennemann
90adda6a93 Display either 'start' or 'stop' screenshare button, if screenshare enabled on config 2018-01-16 17:12:41 -02:00
KDSBrowne
644cb4f9b2 fix broken styles on error, on meetingEnd and for removed users 2018-01-16 10:26:57 -08:00
KDSBrowne
cc32e1d2d9 edit css to prevent disappearing background 2018-01-16 09:03:14 -08:00
Anton Georgiev
748ee1279a
Merge pull request #4941 from MaximKhlobystov/mute-button-icon-update-fix 
[HTML5 Client] Fix for Mute/Unmute button's icon update.
 2018-01-16 14:06:30 -02:00
Augusto Bennemann
7dacdfb04b Changes requested on #4955 2018-01-16 14:04:34 -02:00
Maxim Khlobystov
893067139b Declared the muteHandle variable. 2018-01-16 10:56:31 -05:00
Anton Georgiev
3366bc32b0
Merge pull request #4851 from Tainan404/fix-language-selector 
Language selector of the application, each option appears in its native language.
 2018-01-16 13:40:03 -02:00
Anton Georgiev
a4d57ac4b6
Merge pull request #4963 from MaximKhlobystov/hangup-audio-userlist-fix 
[HTML5 Client] Fix for the issue with users disappearing from userlist when hanging up audio.
 2018-01-16 13:39:38 -02:00
Oleksandr Zhurbenko
173cc7cb89 Fixed aligning of the Dropdown Close button on small screens 
Fixes #4954
 2018-01-15 14:58:23 -08:00
Maxim Khlobystov
d9955ae286 Small cleanup. 2018-01-15 16:13:18 -05:00
Maxim Khlobystov
1394984be7 Made the mute/unmute observer work. 2018-01-15 16:01:57 -05:00
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
Maxim Khlobystov
4ee059f381 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into hangup-audio-userlist-fix 2018-01-15 11:47:35 -05:00
Maxim Khlobystov
71c2d16918 Made sure user is removed from userlist only in case of dial-in (not web) users. 2018-01-15 11:47:19 -05: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
KDSBrowne
810a4c9972 alter breakpoint to fix btn alignment on some devices 2018-01-12 11:30:15 -08: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
KDSBrowne
2e2a1609a4
resolve lint issue 2018-01-12 11:32:33 -05: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
2725b80ac4 revert env 2018-01-11 10:48:24 -02:00
Tainan Felipe
18011fe3da Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-language-selector 2018-01-11 10:35:31 -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
Joao Siebel
0764ae867c Remove old whiteboard toolbar items config 2018-01-11 08:51:37 -02:00
Augusto Bennemann
a8888e49ad Prevent multiple clicks on share/unshare video button 2018-01-10 23:16:49 -02:00
Maxim Khlobystov
aeb1aeb14b Made sure the mute/unmute button is updated when Flash client mutes/unmutes HTML5 client. 2018-01-10 15:51:10 -05:00
Maxim Khlobystov
12e474fa01 Doing the mute/unmute flag change inside the Audio Manager instead of using Mongo observer. 2018-01-10 15:41:21 -05:00
Joao Siebel
0b02d90927 Resolve merge conflicts 2018-01-10 17:22:42 -02:00