Commit Graph

24231 Commits

Author SHA1 Message Date
Chad Pilkey
d12707b14d add modal warnings for edge users 2019-03-28 15:18:22 -07:00
bobakoftadeh
0186249d64 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-breakoutroom-option 2019-03-28 21:39:38 +00:00
bobakoftadeh
b266fb11b4 Remove breakout room option from actions-dropdown 2019-03-28 21:39:23 +00:00
Diego Benetti
9ef248e7a2 Fix text tool losing focus 2019-03-28 18:12:49 -03:00
Chad Pilkey
8daa1650e6
Merge pull request #7128 from bigbluebutton/fix-guest-wait-when-join-html
Fix guest wait when join html
2019-03-28 17:03:15 -04:00
Richard Alam
0f93ce4a38 - store the client url instead of joinviahtml5 info into user session. That
way we can preserve the client url form the join and don't have to recreate
   in the guestWaitHandler
2019-03-28 13:46:53 -07:00
Richard Alam
3aeaf72719 - flag that an authed user joined the meeting 2019-03-28 12:47:52 -07:00
Richard Alam
86a10b6c77 - handle when forced to join html5 using bigbluebutton.properties and need to wait for approval 2019-03-28 11:41:32 -07:00
Richard Alam
cbd68df5ee - flag the user to join using html5 2019-03-28 11:27:47 -07:00
Richard Alam
0d217447eb - check if guest user waiting for mod approval is joining via html5 2019-03-28 11:24:02 -07:00
Chad Pilkey
2820af6288
Merge pull request #7127 from ritzalam/do-not-make-mods-wait
- do not make moderators wait no matter what the guest policy is
2019-03-28 13:39:25 -04:00
Richard Alam
6774062ca2 - do not make moderators wait no matter what the guest policy is 2019-03-28 10:35:41 -07:00
KDSBrowne
2e0e2a98a7 fix for issue #6682 / make poll panel resizable 2019-03-28 15:58:10 +00:00
Tainan Felipe
a3609debc4 Fix misspelling 2019-03-28 08:51:38 -03:00
Fred Dixon
7225d83131
Merge pull request #7111 from riadvice/fix-cleaning-logs
Fix clean logs and improve cleaning FreeSwitch logs
2019-03-27 21:43:57 -04:00
Fred Dixon
8cfc2c5b9c
Merge pull request #7117 from Tainan404/issue-7026
Fix user counter in breakout room panel
2019-03-27 21:43:21 -04:00
Chad Pilkey
1f17a4177e
Merge pull request #7119 from ritzalam/enable-scalariform
Enable scalariform
2019-03-27 18:05:10 -04:00
Richard Alam
a687b71fc1 - enable scalariform for akka transcode 2019-03-27 15:00:37 -07:00
Chad Pilkey
3114d47871
Merge pull request #7121 from KDSBrowne/2.2-locale-update-2019-03-27
Add translations from Transifex - 2019/03/27
2019-03-27 17:28:31 -04:00
KDSBrowne
a6d16c41a1 Pull locales from Transiex - 2019/03/27 2019-03-27 21:03:35 +00:00
Richard Alam
bee4b79b51 - enable scalariform for bbb-apps-common 2019-03-27 13:53:09 -07:00
Tainan Felipe
8bf431441e Fix client crashing when prensentations isn't converted 2019-03-27 17:48:20 -03:00
Richard Alam
3f7199c307 - enable scariform for akka-apps 2019-03-27 13:41:16 -07:00
Richard Alam
81d7c117f7 - enable scalariform for bbb-common-web 2019-03-27 13:36:34 -07:00
Richard Alam
fe3979e4a2 - enable scalariform for bbb-common-message 2019-03-27 13:34:56 -07:00
Richard Alam
8d4122cece - enable scalariforn for fsesl-akka 2019-03-27 13:33:22 -07:00
Tainan Felipe
c7a8e7715c Fix user counter in breakout room panel 2019-03-27 15:24:00 -03:00
KDSBrowne
afe128fdb7 add Spacebar shortcut to toggle whiteboard Pan 2019-03-27 17:15:19 +00:00
Tainan Felipe
14318580f5 Add to propType 2019-03-27 08:46:23 -03:00
Tainan Felipe
de9af8efd7 Improve code quality 2019-03-26 14:50:18 -03:00
Tainan Felipe
978bf9cadd Fix moderator being able to stop recording when users aren't allowed 2019-03-26 14:38:45 -03:00
Ghazi Triki
a8c01fe122 Fix clean logs and improve cleaning FreeSwitch logs. 2019-03-26 18:02:38 +01:00
Fred Dixon
0dd4107810
Update bigbluebutton-release 2019-03-26 09:48:50 -04:00
Fred Dixon
d53eee800b
Merge pull request #7108 from capilkey/dont-clean-mod-message
Don't clear the mod message from chat
2019-03-26 07:24:21 -04:00
Fred Dixon
58c7710ee7
Merge pull request #7107 from capilkey/fix-translation-audio-modal
Moved the translation of the audio modal headers
2019-03-26 07:23:56 -04:00
Chad Pilkey
b7627d8075 don't clear the mod message from chat 2019-03-25 16:02:37 -07:00
Chad Pilkey
606ecc3dc5 moved the translation of the audio modal headers 2019-03-25 15:43:25 -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
bobakoftadeh
f36cb36dfa Improve position of permission-overlay for Safari 2019-03-25 16:44:55 +00:00
Tainan Felipe
76233e80e9 Improve error messages information 2019-03-25 13:34:12 -03:00
Tainan Felipe
b4bbfbb7c6 Fix modal closing when get some conversion error 2019-03-25 13:20:18 -03: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
KDSBrowne
1b8ff2f9fe add improvements suggested in PR #6838 2019-03-24 17:28:01 +00:00