Commit Graph

23680 Commits

Author SHA1 Message Date
Ghazi Triki
68e6468c34 Fix guestWaitHandler in ApiController.groovy 2019-01-17 14:21:22 +01:00
Ghazi Triki
5aa3b04008 Fix log file name. 2019-01-17 13:58:14 +01:00
Ghazi Triki
5fc13c3447 Load freemaker templates whether the application runs within a JAR file or outside of it. 2019-01-17 11:39:50 +01:00
PravenJohn
ab637b8370
updating kurento conn string to the service name 2019-01-17 12:53:46 +05:30
KDSBrowne
0630358050 fix console errors / add breakout invitation to user-options 2019-01-16 22:58:22 +00:00
Anton Georgiev
ff3898224b
Merge branch 'master' into master-presentation-ui 2019-01-16 17:33:29 -05: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
KDSBrowne
ec1d7255ab Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-add-create-br-to-manage-user-menu 2019-01-16 22:22:17 +00: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
Lucas Zawacki
bf99fff416 Fix a few more linter errors and remove old translation 2019-01-16 14:01:22 -03:00
Lucas Zawacki
69c89cb555 Fix some linter errors and add translation 2019-01-16 13:50:24 -03: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
PravenJohn
100d31dd01
Adding port 8021 used by fsesl 2019-01-16 19:43:29 +05:30
Lucas Zawacki
cff3c21212 Push start/stop external video events to REDIS 2019-01-16 10:57:48 -03:00
Lucas Zawacki
8c3079517c Youtube videos. Use PlayerState directly from react-youtube 2019-01-16 10:57:39 -03:00
Lucas Zawacki
6d4d3daba3 Youtube video. Fix syntax, variable names, move some code into the service, remove unused code 2019-01-16 10:57:20 -03:00
Lucas Zawacki
dfea777fb3 Fixing youtube sync commits 2019-01-16 10:41:09 -03:00
Lucas Zawacki
9b2bc7c219 Correctly unmount youtube player area 2019-01-16 10:40:49 -03:00
Vitor Mateus
49711801f1 Fix public chat alerts #6430 2019-01-16 11:08:20 -02:00
praven
62edac4912 Adding variables listed in the docker README 2019-01-16 12:44:57 +05:30
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
Ghazi Triki
728491ae8d Use logback.xml for bigbluebutton-web. 2019-01-15 14:37:45 +01:00
Lucas Zawacki
e883d3a2b0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into master-presentation-ui 2019-01-15 10:31:12 -03:00
Lucas Zawacki
2c98ecb2b8 Aesthetic fixes to buttons 2019-01-15 10:16:01 -03:00
Ghazi Triki
de17942501 Fix mapping for swf files. 2019-01-15 11:36:49 +01:00
Ghazi Triki
d38f55b30a Improve groovy code formatting. 2019-01-15 11:03:07 +01:00
gustavotrott
c21bb693b4 Store in session if can generate ice candidates, change timeout to 5secs, display error msgs 2019-01-14 22:45:32 -02:00