Commit Graph

23420 Commits

Author SHA1 Message Date
bobakoftadeh
5284a351c0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into fix-dropdown-webcaps 2019-01-21 21:53:22 +00:00
bobakoftadeh
1b4d956cb5 Fixed dropdown and removed gray border for webcams 2019-01-21 21:51:20 +00:00
Anton Georgiev
913d906e5b
Merge pull request #6606 from antobinary/remove-logs
Remove ping-pong logs for webcams
2019-01-21 15:09:48 -05:00
Anton Georgiev
120c4712dc remove ping-pong logs for webcams 2019-01-21 20:05:52 +00:00
Anton Georgiev
acaeafdea0
Merge pull request #6598 from bigbluebutton/antobinary-video-enable
Enable kurento webcams [video] by default
2019-01-21 12:35:10 -05:00
Anton Georgiev
fa7014c133
Merge pull request #6597 from antobinary/remove-logs
Removed REDIS pubsub html5 logs; Disabled debug by default
2019-01-21 12:24:40 -05:00
Anton Georgiev
3fe058db31
Enable kurento webcams [video] by default 2019-01-21 12:08:04 -05:00
Anton Georgiev
c1ad2f30a6
Remove km.json missed in #6589 2019-01-21 12:06:59 -05:00
Anton Georgiev
51f7645607 remove REDIS pubsub html5 logs; turned off debug 2019-01-21 17:00:24 +00:00
Anton Georgiev
a3d2d35b69
Merge pull request #6372 from lfzawacki/youtube-2.2
Syncrhonized Youtube video player for meetings (WIP)
2019-01-21 10:10:33 -05:00
Lucas Zawacki
57fc7a81f0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into youtube-2.2 2019-01-21 02:50:56 -03:00
Lucas Zawacki
095935e7ef Small fixes 2019-01-21 02:49:01 -03:00
Anton Georgiev
831bb77d33
Merge pull request #6589 from antobinary/logout-endmeeting-menu
HTML5 client locales on 2.2
2019-01-18 16:43:52 -05:00
Anton Georgiev
9ed20b4455
Merge pull request #6587 from vitormateusalmeida/issue-6500
Avoid duplicated messages. #6500
2019-01-18 14:44:44 -05:00
Anton Georgiev
94ab770c94 html5 locales on 2.2; updated script and files 2019-01-18 16:42:37 +00:00
Anton Georgiev
48425b65d3
Merge pull request #6547 from gustavotrott/safari-audio-video-fix
Fix problems with audio and video in Safari/Webview
2019-01-18 11:37:33 -05:00
Fred Dixon
167ec9ff2e
Merge pull request #6588 from ffdixon/update-landing-2
Updated index page for 2.2-dev
2019-01-18 11:19:58 -05:00
Fred Dixon
a3fda63b49 Updated index page for 2.2-dev 2019-01-18 10:19:26 -06:00
Lucas Zawacki
3c75690d8c Let's try vimeo 2019-01-18 10:34:03 -03:00
Vitor Mateus
2dfb1d872e Avoid duplicated messages. #6500 2019-01-18 11:03:09 -02:00
Fred Dixon
2d7c79f66b
Merge pull request #6584 from ffdixon/bbb-conf-etherpad
Added restart for Etherpad
2019-01-17 18:49:50 -05:00
Fred Dixon
84c383be3a Added restart for Etherpad 2019-01-17 17:49:04 -06:00
Anton Georgiev
3365cabc72
Update year in html5 settings.yml 2019-01-17 15:15:10 -05:00
Anton Georgiev
33f1d542a3
Merge pull request #6559 from antobinary/logout-endmeeting-menu
Added End Meeting menu for moderators
2019-01-17 14:36:56 -05: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
Lucas Zawacki
68e6e75525 More syntax fixes better log for external video auth 2019-01-17 14:12:32 -03: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
Lucas Zawacki
cff3c21212 Push start/stop external video events to REDIS 2019-01-16 10:57:48 -03:00