Commit Graph

24197 Commits

Author SHA1 Message Date
Joao Siebel
08d177dac0 add initial network logic 2019-04-18 18:15:48 -03:00
Joao Siebel
dcbce93e7c add webcams data collector 2019-04-12 11:11:36 -03:00
Joao Siebel
6bbaeea0a0 Merge remote-tracking branch 'upstream/master' into network-indicator 2019-04-03 09:01:32 -03:00
Chad Pilkey
4f0d25bb2b
Merge pull request #7154 from KDSBrowne/2.2-fix-youtube-error
Fix Youtube option throwing error
2019-04-02 15:14:15 -04:00
KDSBrowne
07ec47f2ef fix Actions Youtube option not working 2019-04-02 18:57:29 +00:00
Chad Pilkey
7f33179732
Merge pull request #7120 from Tainan404/issue-6998
Fix client crashing when prensentation isn't converted
2019-04-02 13:51:37 -04:00
Chad Pilkey
51c6c65624
Merge pull request #7089 from KDSBrowne/2.2-Imp-poll-result
Improvements to poll panel and options
2019-04-02 13:45:07 -04:00
Tainan Felipe
c644ab6d1a Remove null exceppetion 2019-04-02 14:10:00 -03:00
KDSBrowne
ea62805ea3 move const variables 2019-04-02 04:07:45 +00:00
Chad Pilkey
b18c05debd
Merge pull request #7093 from KDSBrowne/2.2-Imp-quick-poll
Improvements to quick poll menu options
2019-04-01 17:07:15 -04:00
Chad Pilkey
687d3dbc7e
Merge pull request #7075 from BobakOftadeh/permission-overlay-improve
Improved permissions-overlay
2019-04-01 17:01:49 -04:00
Chad Pilkey
47119414cf
Merge pull request #7069 from jfsiebel/sort-presentation-list
Sort presentation list
2019-04-01 15:50:20 -04:00
Chad Pilkey
b75e579acf
Merge pull request #7062 from riadvice/html5-files-cdn
Support loading the HTML5 main JS file and its assets from a CDN
2019-03-29 16:38:01 -04:00
Ghazi Triki
b1e6cff44e Improve CDN CORS rules. 2019-03-29 18:33:23 +01:00
Fred Dixon
6f2323098a
Update bigbluebutton-release 2019-03-29 12:27:50 -04:00
Ghazi Triki
5b87524520 Use the embedded meteor CDN feature. 2019-03-29 16:47:07 +01:00
Chad Pilkey
365dc136b0
Merge pull request #7112 from Tainan404/issue-7031
Fix moderator being able to stop recording when it aren't allowed
2019-03-28 20:09:14 -04:00
Chad Pilkey
dc9b827bd6
Merge pull request #7125 from KDSBrowne/2.2-add-pan-hotkey
Add spacebar hotkey to toggle whiteboard Pan tool
2019-03-28 19:47:37 -04:00
Chad Pilkey
bdf2e3337f
Merge pull request #7129 from BobakOftadeh/remove-breakoutroom-option
Remove breakout room option from actions-dropdown
2019-03-28 19:40:19 -04:00
Chad Pilkey
8a7511aa93
Merge pull request #7131 from diegobenetti/issue6904-talking-causes-text-tool-lose-focus
Talking causes text tool lose focus
2019-03-28 19:36:56 -04:00
Chad Pilkey
c768fae5d0
Merge pull request #7132 from capilkey/more-button-fixes
Fix outline of disabled buttons and button getting cut off
2019-03-28 18:57:56 -04:00
Chad Pilkey
c6844359de fix outline of disabled buttons and button getting cut off 2019-03-28 15:53:35 -07:00
Chad Pilkey
45c1e1b0a3
Merge pull request #7130 from capilkey/edge-html5-warnings
Add modal warnings for edge users
2019-03-28 18:40:51 -04:00
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