Commit Graph

24125 Commits

Author SHA1 Message Date
Chad Pilkey
b7627d8075 don't clear the mod message from chat 2019-03-25 16:02:37 -07:00
Fred Dixon
b81ac3d0bb
Merge pull request #7105 from capilkey/warning-for-ie
Warning for IE users
2019-03-25 18:13:21 -04:00
Fred Dixon
5b0e0e9c7e
Merge pull request #7106 from ritzalam/update-floash-locales-mar-25-2019
- update flash locales to latest
2019-03-25 18:12:49 -04:00
Richard Alam
2b7de74dcd - update flash locales to latest 2019-03-25 14:46:04 -07:00
Chad Pilkey
facf1ab7b2 warning for ie users 2019-03-25 14:38:41 -07:00
Chad Pilkey
053821de52
Merge pull request #7104 from ritzalam/disable-meeting-inactivity-check
- set meeting inactivity check to zero as default which disables the…
2019-03-25 15:42:50 -04:00
Richard Alam
9801efb95a - make user inactivitiy audit disabled by default 2019-03-25 12:39:09 -07:00
Richard Alam
547249b475 - set meeting inactivity check to zero as default which disables the check. When set to
zero, the meeting won't end due to inactivity.
2019-03-25 10:10:03 -07:00
Fred Dixon
eb4c67d5e0
Merge pull request #7100 from riadvice/fix-meeting-info
Fix API variables formatting for meeting endTime and duration.
2019-03-25 09:00:52 -04:00
Ghazi Triki
48ca58ea3e Fix API variables formatting for meeting endTime and duration. 2019-03-25 13:41:14 +01:00
Fred Dixon
41cfa9a0bd
Merge pull request #7090 from capilkey/clean-up-action-bar-buttons
Clean all the buttons
2019-03-23 09:26:39 -04:00
Chad Pilkey
7ade56cb2c fix button outlines and clean up video button and video preview 2019-03-22 15:45:44 -07:00
Fred Dixon
2aa5faf7ab
Merge pull request #7095 from bigbluebutton/ffdixon-patch-3
Update link for tutorial videos for HTML5
2019-03-22 15:06:06 -04:00
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
815e454eb7 revert normalize.css back to old version to avoid Safari issue 2019-03-21 16:24:43 -07:00
Chad Pilkey
d1851708f2 eslint correction in audio-controls 2019-03-21 15:43:11 -07:00
Chad Pilkey
237f37f874 Merge remote-tracking branch 'upstream/master' into clean-up-action-bar-buttons 2019-03-21 15:36:58 -07:00
Chad Pilkey
c224040e9b more cleanup of the buttons and listen-only action bar icon 2019-03-21 15:16:56 -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
Chad Pilkey
5c357a7fb7 update normalize.css to a newer version 2019-03-21 14:03:22 -07: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
Chad Pilkey
d3656ef022 clean up of the buttons. simplified and reduced 2019-03-19 10:11:48 -07: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