Commit Graph

23509 Commits

Author SHA1 Message Date
prlanzarin
1e71edb18a Add specific case for safari-specific devices on the SD offer release 2019-01-23 13:23:43 +00:00
Bobak Oftadeh
42eba49dcd Adjusted min-width for dropdown 2019-01-22 14:50:25 -08:00
Chad Pilkey
6ebd41312f
Merge pull request #6616 from capilkey/2.2-2019-Flash-copyright
Update the copyright in 2.2 Flash client to 2019
2019-01-22 17:15:18 -05:00
Chad Pilkey
4d9d0aaf23 update the copyright in 2.2 Flash client to 2019 2019-01-22 14:14:35 -08:00
Anton Georgiev
59e16a0bec
Merge pull request #6614 from antobinary/remove-logs
Recovered matching 2.0 German strings manually
2019-01-22 16:57:53 -05:00
Anton Georgiev
850e9bc718 Recovered matching 2.0 German strings manually 2019-01-22 21:56:30 +00:00
prlanzarin
1d03025705 Fixed Chrome extension-based screensharing with the newest adapter on Flash 2019-01-22 17:26:27 +00:00
Vitor Mateus
50047ea36b Fix error on click in toast 2019-01-22 09:42:03 -02:00
Anton Georgiev
4ca1995bc6
Merge pull request #6608 from prlanzarin/improve-gDM-support-2.2
Improved getDisplayMedia detection
2019-01-21 17:07:34 -05:00
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
prlanzarin
544d2ad38b Improved getDisplayMedia detection 2019-01-21 21:04:59 +00:00
prlanzarin
7df4349609 Reverted a change on kurento-utils that caused problems with the SDP offer generation 2019-01-21 20:25:00 +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
Chad Pilkey
743caa2d15 remove WebRTC blocks for Edge and update adapter.js 2019-01-21 11:25:32 -08: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
KDSBrowne
4920265dc0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-add-create-br-to-manage-user-menu 2019-01-21 17:02:18 +00:00
Anton Georgiev
51f7645607 remove REDIS pubsub html5 logs; turned off debug 2019-01-21 17:00:24 +00:00
KDSBrowne
03dbc4de14 ensure unique key for dropdown element 2019-01-21 16:53:13 +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
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