BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,066 Commits 13 Branches 260 Tags 1.1 GiB
46d65489d9
Commit Graph

23066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
c807da095f
Update sip.js 
Fix #6167
 2018-10-24 16:26:20 -04:00
Fred Dixon
8926851741
Merge pull request #6188 from bigbluebutton/ffdixon-patch-1 
Update bbbResources.properties
 2018-10-24 16:24:58 -04:00
Fred Dixon
b4a4f957dd
Update bbbResources.properties 
Update quotes
 2018-10-24 16:24:44 -04:00
Richard Alam
10d6109ddc Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into delay-removing-user-when-leaving 2018-10-24 13:09:44 -07:00
Chad Pilkey
539e29d8d4
Merge pull request #6185 from capilkey/fix-flash-reconnect-attempts 
Fix Flash reconnect attempts
 2018-10-24 16:03:54 -04:00
Tainan Felipe
ab064f47c9 fiz zoom when fit to width out 2018-10-24 16:50:49 -03:00
Richard Alam
92a2cd0d60 - delay removing user from user's list in case the user is just reconnecting 2018-10-24 12:42:00 -07:00
Oswaldo Acauan
a3de0579f3 Remove debug logging 2018-10-24 17:34:28 -02:00
Oswaldo Acauan
458b2f442f Merge branch 'html5-theming' of github.com:oswaldoacauan/bigbluebutton into css-variables 2018-10-24 17:32:21 -02:00
Oswaldo Acauan
1de297c1e2 Fix line-heights and convert scss calculations to calc() 2018-10-24 17:32:09 -02:00
Chad Pilkey
206bcf9ef9
Merge pull request #6184 from capilkey/fix-html5-vu-ejection 
Stop HTML5 ejecting from voice on reconnect and fix voice user creation
 2018-10-24 15:26:19 -04:00
Fred Dixon
3d20450629
Update default.example.yml 
Temporary fix until we update the calculation of the pool size
 2018-10-24 15:20:41 -04:00
Chad Pilkey
fac51f1a64
Merge pull request #6186 from capilkey/remove-webrtc-stats 
[Flash] disable the webrtc audio stats
 2018-10-24 15:13:43 -04:00
Chad Pilkey
89921f7f5a [Flash] disable the webrtc audio stats 2018-10-24 12:08:24 -07:00
Chad Pilkey
83c2ceec76 fix Flash reconnect attempts 2018-10-24 12:02:52 -07:00
Anton Georgiev
ef9f248607
Merge branch 'master' into html5-theming 2018-10-24 14:58:59 -04:00
Chad Pilkey
81983ae1e1 Stop HTML5 ejecting from voice on reconnect and fix voice user creation 2018-10-24 11:40:38 -07:00
Bobak Oftadeh
262bd32bc6 Cleaned up user-options component and container 2018-10-24 11:34:11 -07:00
Anton Georgiev
cde6311a5d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-24 18:26:13 +00:00
Tainan Felipe
69e1404ed1 Fix intl 2018-10-24 14:54:19 -03:00
Oswaldo Acauan
8696b831d3 Change SCSS variables to CSS variables missed while merging with upstream 2018-10-24 15:10:15 -02:00
Tainan Felipe
7677d19159 Remove behavior that add opacity when hover the presentation 2018-10-24 14:09:32 -03:00
Anton Georgiev
2d1ad1fcd9
Merge pull request #6182 from antobinary/custom-configs 
Drop metadata configs; use userdata configs for autoSwap
 2018-10-24 13:07:47 -04:00
João Francisco Siebel
a42946658f improve toolbar when have only one tool 2018-10-24 13:26:23 -03:00
Anton Georgiev
ffbc11162e fixed linter errors 2018-10-24 15:33:39 +00:00
KDSBrowne
e951b9180f prevent other menus covering polling options 2018-10-24 14:50:47 +00:00
Richard Alam
eafa3273c5 - flag the user first when receiving user left event in case user is just reconnecting 2018-10-24 07:41:39 -07:00
KDSBrowne
9c3a21641b prevent chat / poll pane being open at the same time 2018-10-24 14:29:51 +00:00
KDSBrowne
abd5e8a224 update styling / fix bugs 2018-10-24 14:17:13 +00:00
Anton Georgiev
e888f5dc14 removed dummy button examples visible without presentation 2018-10-24 14:01:07 +00:00
Anton Georgiev
74c51e37c8 drop obsolete || false check 2018-10-24 12:46:05 +00:00
Anton Georgiev
57dc55b559 drop metadata configs; use userdata configs for autoSwap 2018-10-23 20:44:17 +00:00
Tainan Felipe
2b5c9a32b4 Add intl 2018-10-23 17:34:09 -03:00
Tainan Felipe
60e0446d89 Fix zoom keeps after fit to width 2018-10-23 16:58:13 -03:00
Tainan Felipe
4d7861f0be Add intl message 2018-10-23 16:29:19 -03:00
Richard Alam
a3031ae5c7
Merge pull request #6180 from ritzalam/do-not-eject-voice-user 
- check to make sure user is not kicked out of voice conference even…
 2018-10-23 14:40:31 -04:00
Tainan Felipe
cf08440a25 Remove function 2018-10-23 15:16:34 -03:00
Tainan Felipe
c53a007438 Remove chages on modifier 2018-10-23 15:15:10 -03:00
Richard Alam
fd36501c84 - check to make sure user is not kicked out of voice conference even when joined using webrtc when 
flash client auto-reconnects.
 2018-10-23 10:55:51 -07:00
Tainan Felipe
958bd406a6 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-23 14:53:46 -03:00
Tainan Felipe
c2538be574 Remove consoles 2018-10-23 14:27:48 -03:00
Tainan Felipe
1bc8ae0b21 add join audio only, and imporov UX 2018-10-23 14:18:09 -03:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning 
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
 2018-10-23 14:21:58 -02:00
Fred Dixon
f1cdd7107e
Merge pull request #6173 from ffdixon/fix-executable 
Fix executable of bbb-conf
 2018-10-22 16:41:25 -04:00
Fred Dixon
d067fc8ee4 Fix executable of bbb-conf 2018-10-22 15:40:34 -05:00
Fred Dixon
bd90449671
Merge pull request #6172 from ffdixon/fix-wsUrl-bbb-conf 
Update wsUrl for settings.yml
 2018-10-22 16:29:50 -04:00
Fred Dixon
1ca0a251f4 Update wsUrl for settings.yml 2018-10-22 15:27:46 -05:00
Bobak Oftadeh
0cde376e67 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-22 10:06:18 -07:00
Anton Georgiev
591adc89e6
Merge pull request #6168 from jfsiebel/configurable-whiteboard-tools-list 
Configurable whiteboard tools
 2018-10-22 13:00:14 -04:00
Anton Georgiev
dbc5bc11a0
Merge pull request #6110 from BobakOftadeh/user-manage 
User manage button
 2018-10-22 10:54:18 -04:00