Commit Graph

24106 Commits

Author SHA1 Message Date
Fred Dixon
4e6da349d2
Update link for tutorial videos for HTML5 2019-03-22 15:05:50 -04:00
Fred Dixon
0a4a8b9cf4
Merge pull request #7094 from capilkey/no-audio-bite
Show bite out of avatar when not in audio
2019-03-22 14:47:48 -04:00
Chad Pilkey
d2c835ff57 show bite out of avatar when not in audio 2019-03-22 11:10:47 -07:00
Chad Pilkey
ee4f4691c3
Merge pull request #7082 from BobakOftadeh/improve-recording-modal
Add resume title to recording modal
2019-03-21 17:27:01 -04:00
bobakoftadeh
4e032fd627 Adjusted recording props 2019-03-21 17:47:01 +00:00
bobakoftadeh
42794c99d0 Improve implementation of meeting lookup and recordingTime defaultProps 2019-03-21 16:21:24 +00:00
Fred Dixon
bdb9c16be5
Merge pull request #7084 from KDSBrowne/2.2-close-cam-on-logout
Close local webcam view on logout
2019-03-21 09:14:32 -04:00
KDSBrowne
e7782d0eb7 Close local webcam view on logout 2019-03-21 13:08:53 +00:00
Chad Pilkey
b94616d2c1
Merge pull request #7073 from pedrobmarin/fit-to-width-wannabe
Fit-to-width adapted to the new toolbar
2019-03-20 14:26:24 -04:00
bobakoftadeh
0af54b03fd Add resume title to recording modal 2019-03-20 17:20:28 +00:00
Fred Dixon
4770ef7144
Merge pull request #6929 from fcecagno/disable-chapter-break
Disable chapter break by default
2019-03-20 10:21:31 -04:00
Pedro Beschorner Marin
a8d38fd156 Pulling presentation-close-button upfront 2019-03-20 09:57:54 -03:00
Pedro Beschorner Marin
b0c3480fb1 Trying to fix fit-to-width 2019-03-19 16:50:08 -03:00
Richard Alam
322c909b5c
Merge pull request #7046 from capilkey/2.2-fix-banner
Fix enter API parsing and cleaned up the ChatTab
2019-03-19 14:06:14 -04:00
Anton Georgiev
bb5bff6c45
Omit "BigBlueButton" in language file
(keeping it only in the optional Feedback which is disabled by default)
2019-03-18 11:17:16 -04:00
Anton Georgiev
719c3f99d6
Merge pull request #7042 from antobinary/chat-updates
Only process chat msgs when requested from html5
2019-03-18 09:13:54 -04:00
Anton Georgiev
c9b6a7c6c1
Update updateVoiceUser.js 2019-03-18 09:12:25 -04:00
Anton Georgiev
49d30e9860
Merge pull request #7064 from Tainan404/issue-4937
Remove old folders references of .gitignore file.
2019-03-18 09:05:28 -04:00
Tainan Felipe
a1b6cc6c3a Remove old folders refereces of .gitignore file 2019-03-18 10:03:36 -03:00
Anton Georgiev
8d6ba4ba2d
Merge pull request #7063 from Tainan404/issue-7026
Fix weird number in breakout user counter
2019-03-18 08:39:14 -04:00
Tainan Felipe
8a10657b83 Fix weird number in breakout user counter 2019-03-18 09:22:25 -03:00
Fred Dixon
260741d24c
Merge pull request #7052 from ffdixon/fix-bbb-conf-29
Fixed typo in updating settings.yml
2019-03-16 19:19:57 -04:00
Fred Dixon
660376aa03 Fixed typo in updating settings.yml 2019-03-16 18:19:09 -05:00
Richard Alam
90641d5280 Merge branch 'ritzalam-track-user-register-join' 2019-03-16 09:37:12 -07:00
Richard Alam
1e26e8ce29 Merge branch 'track-user-register-join' of https://github.com/ritzalam/bigbluebutton into ritzalam-track-user-register-join 2019-03-16 09:32:55 -07:00
Richard Alam
53d990c9d2 Merge branch 'riadvice-bbb-conf-clean' 2019-03-16 09:01:14 -07:00
Richard Alam
42982482d8 - fix typo 2019-03-16 08:54:06 -07:00
Richard Alam
b41d25d847 Merge branch 'bbb-conf-clean' of https://github.com/riadvice/bigbluebutton into riadvice-bbb-conf-clean 2019-03-16 08:07:36 -07:00
Richard Alam
059ab329d1 Merge branch 'riadvice-flash-deprecation' 2019-03-16 08:02:50 -07:00
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
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
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
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