Commit Graph

24231 Commits

Author SHA1 Message Date
Richard Alam
3cda13b145 Merge branch 'flash-deprecation' of https://github.com/riadvice/bigbluebutton into riadvice-flash-deprecation 2019-03-16 07:54:16 -07:00
Fred Dixon
da1c5e4e56
Merge pull request #7047 from ffdixon/fix-bbb-conf-32
Fix bbb conf 32
2019-03-15 19:47:51 -04:00
Fred Dixon
b34ca1d8b8 update public.note.url on bbb-conf --setip 2019-03-15 18:46:46 -05:00
Fred Dixon
2335c1d8a5 Added more checks to sip.nginx 2019-03-15 18:32:06 -05:00
Fred Dixon
395f5787de Need to specify proper path to apply-lib.sh 2019-03-15 18:29:30 -05:00
Fred Dixon
3bec6a2702
Merge pull request #7023 from riadvice/bbb-conf-update
Refactoring to bbb-conf shell script application for 2.2
2019-03-15 18:59:38 -04:00
Chad Pilkey
5507af57d1 remove unneeded whitespace in ChatTab 2019-03-15 14:08:01 -07:00
Chad Pilkey
b022318464 fix enter response parsing 2019-03-15 14:06:35 -07:00
Tainan Felipe
e7a6639909
Merge branch 'master' into issue-6919 2019-03-15 17:10:14 -03:00
Tainan Felipe
57603084d4 Add banner bar for custom parameters 2019-03-15 17:07:14 -03:00
Anton Georgiev
d8c55bb603 only process chat msgs when requested from html5 2019-03-15 18:39:48 +00:00
Calvin Walton
581dd58596
Merge pull request #7041 from capilkey/2.2-flash-cache-busting
Add cache busting to JS files that were missing it
2019-03-15 13:54:09 -04:00
Chad Pilkey
931bd35430 add cache busting to js files that were missing it 2019-03-15 10:34:16 -07:00
KDSBrowne
a24b2567fb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-Imp-poll-result 2019-03-15 16:09:12 +00:00
Anton Georgiev
23a3deee34
Merge pull request #7035 from KDSBrowne/2-2.add-youtube-note
Add message to share YouTube modal
2019-03-15 09:58:43 -04:00
KDSBrowne
04c11ad26d fix for issue #7033 2019-03-15 13:04:19 +00:00
Fred Dixon
60ff3662c0
Merge pull request #7029 from capilkey/ff-transfer-resend
Add transfer DTMF resend for Firefox users
2019-03-14 17:26:10 -04:00
Chad Pilkey
242a9f019f add transfer dtmf resend for firefox users 2019-03-14 14:02:51 -07:00
KDSBrowne
341ca37add fix for issue #7027 2019-03-14 19:34:53 +00:00
Anton Georgiev
474bc1e172
Update en.json
Closes #7028
2019-03-14 15:21:53 -04:00
Anton Georgiev
3623b85258
Merge pull request #7015 from jfsiebel/user-inactivity-update
Update inactivity modal
2019-03-14 14:02:56 -04:00
Joao Siebel
ca4a6ca512 add aditional verification and stop audio 2019-03-14 15:02:04 -03:00
Anton Georgiev
5fe8d6a2c0
Merge pull request #6930 from Tainan404/issue-6919
Fix few breakout  room bugs.
2019-03-14 13:05:54 -04:00
Anton Georgiev
af4edb7cbc
Merge pull request #6884 from eduardohfnascimento/fix-upload-types
Change as mime types are coded
2019-03-14 12:57:31 -04:00
Anton Georgiev
80a715bef5
Merge pull request #7025 from antobinary/locales-a
Pulled html5 locales March 14, 2019
2019-03-14 12:49:03 -04:00
Tainan Felipe
eafd7f6673 Add user verification in 2 spots and Fiz join breakout opening into breakout 2019-03-14 13:45:20 -03:00
Anton Georgiev
3290458649 updated .gitignore for bbb-web and bbb-html5 2019-03-14 16:43:48 +00:00
Anton Georgiev
0e894203b3 pulled html5 locales March 14, 2019 2019-03-14 16:42:53 +00:00
Anton Georgiev
f695078d29
Merge pull request #6988 from Tainan404/issue-6941
Hide mute button when moderator join via audio in breakout room.
2019-03-14 11:56:47 -04:00
Anton Georgiev
2d785ad10c
Merge pull request #6999 from BobakOftadeh/youtube-input-text-improvement
Improved YouTube URL input field
2019-03-14 11:52:58 -04:00
Anton Georgiev
17f2dfded6
Merge pull request #6980 from KDSBrowne/2.2-cam-name-bg
Adjust background for name in webcam area
2019-03-14 11:26:48 -04:00
Tainan Felipe
0727f87cf9 add user verification and open join modal to free join breakout 2019-03-14 11:57:06 -03:00
Anton Georgiev
673b580744
Merge pull request #7019 from gustavotrott/webcam-constraints-check
Change to higher resolution if getUserMedia throws exception
2019-03-14 10:53:04 -04:00
Ghazi Triki
2c2c0a1bcc Refactoring to bbb-conf shell script application. 2019-03-14 15:19:13 +01:00
Joao Siebel
3b0ca0609f Rename logout messages and add the missing ones 2019-03-14 11:15:30 -03:00
Anton Georgiev
f3edef953f
Merge pull request #7020 from gustavotrott/issue-6953
Add callback to screenshare remove
2019-03-14 09:27:38 -04:00
Joao Siebel
1eb99862f9 Add message for permission eject 2019-03-14 10:25:07 -03:00
Gustavo Trott
68821c7e0b Add callback to screenshare remove 2019-03-14 10:15:31 -03:00
Gustavo Trott
b09963b013 Change to higher resolution if getUserMedia throw exception 2019-03-14 10:08:13 -03:00
Joao Siebel
3cfc64ac89 Merge remote-tracking branch 'upstream/master' into user-inactivity-update 2019-03-14 09:29:52 -03:00
Anton Georgiev
0cc5aad78f
Merge pull request #7005 from Tainan404/issue-7001
Mute locked users instead of removing audio.
2019-03-13 14:20:45 -04:00
Anton Georgiev
4eb123baae
Merge pull request #7014 from capilkey/fix-unmute-unlocked
Allow unlocked viewers to unmute when meeting is locked
2019-03-13 14:19:41 -04:00
Anton Georgiev
e871d0a800
Merge pull request #6984 from vitormateusalmeida/issue-6944
Fix tooltips and fullscreen
2019-03-13 14:09:22 -04:00
Chad Pilkey
9cfc792eaf allow unlocked viewers to unmute when meeting is locked 2019-03-13 10:28:43 -07:00
Felipe Cecagno
9ce5c45ee2 fix typo 2019-03-13 12:14:49 -03:00
Fred Dixon
f0ed6aa860
Merge pull request #7009 from riadvice/fix-pres-checker-libs
Add commons-compress dependency to pres-checker project
2019-03-13 10:59:38 -04:00
Ghazi Triki
04b8ae7366 Add commons-compress dependency to pres-checker project. 2019-03-13 15:57:14 +01:00
Anton Georgiev
8a636ff0b1
Update en.json 2019-03-13 08:59:47 -04:00
Anton Georgiev
5558b4499a
Merge pull request #7002 from Tainan404/fix-loading-animation
Fix loading animation.
2019-03-13 08:45:18 -04:00
bobakoftadeh
34d9b85518 add focus to input field 2019-03-12 21:56:03 +00:00