BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,380 Commits 13 Branches 260 Tags 1.1 GiB
94ab770c94
Commit Graph

23380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
94ab770c94 html5 locales on 2.2; updated script and files 2019-01-18 16:42:37 +00:00
Anton Georgiev
31eab75cb4 update isOpen to keepOpen dropdown 2019-01-17 19:33:58 +00:00
Anton Georgiev
1e1abbe2c8 end-meeting use "title" from Modal 2019-01-17 19:11:16 +00:00
Anton Georgiev
0190ef4528 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logout-endmeeting-menu 2019-01-17 18:53:32 +00:00
Anton Georgiev
797a485d3e end-meeting removed class variables 2019-01-17 16:33:43 +00:00
Anton Georgiev
3e9ec14275
Merge pull request #6569 from KDSBrowne/2.2-keep-poll-pane-open-after-publish 
Keep poll pane open after publishing results
 2019-01-16 17:24:37 -05:00
Anton Georgiev
5c7872b7e4
Merge pull request #6571 from Tainan404/issue-6567 
Exclude moderator in the Randomly Assign
 2019-01-16 17:09:35 -05:00
Anton Georgiev
9c22eaa946
Merge pull request #6549 from jfsiebel/private-chat-lock-settings 
Fix a problem with ejected user when private chat is locked.
 2019-01-16 16:40:10 -05:00
Fred Dixon
6edd328248
Merge pull request #6576 from ffdixon/tweek-bbb-conf 
Added more checks for FreeSWITCH
 2019-01-16 15:23:18 -05:00
Fred Dixon
e6e1a91173 Added more checks for FreeSWITCH 2019-01-16 14:22:10 -06:00
Anton Georgiev
9fa096436d
Merge pull request #6511 from Tainan404/issue-6485 
Re style error component and implements error description.
 2019-01-16 14:55:23 -05:00
Anton Georgiev
a5cde2db00
Merge pull request #6573 from bigbluebutton/antobinary-draw-thickness 
Set the default draw thickness to 2
 2019-01-16 14:33:04 -05:00
Anton Georgiev
3dda92b006
Set the default draw thickness to 2 
Close #6572
 2019-01-16 14:17:26 -05:00
Tainan Felipe
471730ad88 Exclude moderator in the Randomly Assign 2019-01-16 16:58:03 -02:00
Anton Georgiev
4a431dc114
Merge pull request #6570 from vitormateusalmeida/issue-6520 
Import correction
 2019-01-16 13:40:16 -05:00
Anton Georgiev
49f8a99766
Merge pull request #6476 from Tainan404/issue-6392 
Add breakout room invitation feature
 2019-01-16 13:30:11 -05:00
Vitor Mateus
6a417f7fb3 Import correction 2019-01-16 16:27:48 -02:00
KDSBrowne
48fbf8ce5d keep poll result pane open after publishing 2019-01-16 18:25:24 +00:00
Anton Georgiev
bf71517223
Merge pull request #6568 from vitormateusalmeida/issue-6520 
Limit the zoom functionality in double-tap #6520
 2019-01-16 13:22:20 -05:00
Vitor Mateus
70f16abec6 Limit the zoom functionality (double-tap) to occur only when the pan tool is selected #6520 2019-01-16 16:10:36 -02:00
Tainan Felipe
9054dbf8db Clean up code for best reading 2019-01-16 15:41:21 -02:00
Anton Georgiev
72c9a6cc27
Merge pull request #6566 from MaximKhlobystov/ci-linter-removed-files 
Fix for the issue with linter failing if there are removed files
 2019-01-16 12:14:29 -05:00
Maxim Khlobystov
11c366d603 Make sure linter doesn't use removed files 2019-01-16 12:07:34 -05:00
Tainan Felipe
f1fb776913 Remove console.log 2019-01-16 14:36:32 -02:00
Anton Georgiev
82bbeeb828
Merge pull request #6555 from MaximKhlobystov/webcam-preview-fix 
Fix for the issue with webcam preview and dropdown value
 2019-01-16 10:51:55 -05:00
Anton Georgiev
0d1a351842
Update audio overlay to omit BigBlueButton word 
Closes #6562
 2019-01-15 17:35:47 -05:00
Fred Dixon
fb3bce1d7d
Merge pull request #6561 from kepstin/caption-fixes 
Wait until the media is ready before initializing the acorn player.
 2019-01-15 14:33:48 -05:00
Calvin Walton
04d31d300f Wait until the media is ready before initializing the acorn player. 
Previously, the acorn player was being initialized before the asynchronous
load of captions information completed, meaning that the acorn player didn't
know there were caption tracks, and the CC selector control wasn't available.

Fixes #6463
 2019-01-15 14:15:42 -05:00
Anton Georgiev
f1772f18f8 reactive amIModerator on navbar dropdown 2019-01-15 18:08:42 +00:00
Anton Georgiev
408a0942a5
Merge pull request #6544 from Tainan404/issue-6518 
Fix getBoundingClientRect error on console.
 2019-01-15 11:41:43 -05:00
Anton Georgiev
a9459041c0
Merge pull request #6552 from vitormateusalmeida/issue-5691 
Changed default color in the whiteboard toolbar #5691
 2019-01-15 10:57:25 -05:00
Tainan Felipe
4a396fac10 Fix error getBoundingClientRect at console 2019-01-15 13:31:11 -02:00
Anton Georgiev
96c3777661
Merge pull request #6554 from BobakOftadeh/fix-modal-close 
Fix closing about modal
 2019-01-14 16:40:25 -05:00
Anton Georgiev
b4bd4d1725 recording indicator checks if iAmModerator; end meeting menu 2019-01-14 21:39:03 +00:00
Bobak Oftadeh
7153782c39 Fix closing about modal 2019-01-14 12:23:46 -08:00
Maxim Khlobystov
65522aa272 Make sure the preview video and the dropdown are in sync (set the default preview webcam before displaying the preview video) 2019-01-14 15:18:28 -05:00
Vitor Mateus
5a21ae41ef Changed default color in the whiteboard toolbar #5691 2019-01-14 16:11:06 -02:00
João Francisco Siebel
56322c5060 fix ejecting users when private chat is locked. fix #6434 2019-01-14 14:58:01 -02:00
Tainan Felipe
3ccddd60d5 Remove left overs from merge 2019-01-14 10:23:41 -02:00
Tainan Felipe
0918cc4084 Merge remote-tracking branch 'upstream/master' into issue-6392 2019-01-14 09:30:59 -02:00
Tainan Felipe
e3ae0397c4 Fix button for mobile on error screen 2019-01-14 09:15:49 -02:00
Anton Georgiev
afb812b531 WIP end meeting menu 2019-01-12 00:20:04 +00:00
Anton Georgiev
6c561b102c
Merge pull request #6534 from KDSBrowne/2.2-add-take-presenter 
Add take presenter role option to actions menu
 2019-01-11 14:32:39 -05:00
KDSBrowne
6205059070 edit formatted string / use ternary operator / omit passing Auth.userId 2019-01-11 19:15:31 +00:00
Anton Georgiev
01bedb5ec1
Merge pull request #6474 from vitormateusalmeida/fix-issue-6457 
Fix z-index in presentation
 2019-01-11 13:32:41 -05:00
Anton Georgiev
65024309d1
Merge pull request #6539 from BobakOftadeh/audio-echo-fix 
Fix echo test bug where it stays active after closing
 2019-01-11 11:58:04 -05:00
Bobak Oftadeh
a821fef9c2 Fixed echo test bug 2019-01-11 16:49:52 +00:00
Anton Georgiev
4c0d2c0bd3
Merge pull request #6538 from bigbluebutton/antobinary-shared-notes-width 
Reduce the width of shared notes default width
 2019-01-11 11:05:25 -05:00
Anton Georgiev
265e23af4b
Reuse variable when setting default noteWidth 2019-01-11 11:02:19 -05:00
Anton Georgiev
8629fb48e4
Reduce the width of shared notes default width 
.. to match the default width of chat module. Closes #6529
 2019-01-11 10:48:31 -05:00