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

23196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
João Francisco Siebel
35a02339dc Merge remote-tracking branch 'upstream/master' into chat-old-messages-re-render 2018-12-19 14:16:24 -02:00
João Francisco Siebel
2c3e697742 Merge remote-tracking branch 'upstream/master' into chat-old-messages-re-render 2018-12-19 14:15:20 -02:00
Anton Georgiev
a94e19d544
Merge pull request #6441 from KDSBrowne/improve-tooltip 
Increase tooltip size and add arrow
 2018-12-19 10:15:40 -05:00
Anton Georgiev
cf4c4d6e44
Merge pull request #6440 from jfsiebel/fix-chat-problems 
Fix sending message and chat close button problem.
 2018-12-19 10:08:39 -05:00
João Francisco Siebel
b626795217 fix sending message and close chat button. close #6439 2018-12-19 12:39:32 -02:00
KDSBrowne
661288af8b make tooltips bigger / add arrow 2018-12-19 14:27:48 +00:00
Anton Georgiev
fd46833758
Merge pull request #6423 from KDSBrowne/2.2-fix-double-tooltip 
Fix double tooltips being rendered per button
 2018-12-19 08:45:04 -05:00
Fred Dixon
98443ca46a
Merge pull request #6438 from fcecagno/fix-webhooks-dependencies 
Update webhooks dependencies
 2018-12-18 22:24:53 -05:00
Felipe Cecagno
16805f9756 update webhooks dependencies in order to fix vulnerabilities 2018-12-18 23:25:55 -03:00
Chad Pilkey
0eabd12fe7
Merge pull request #6437 from capilkey/2.2-chrome-plan-b 
Chrome plan-b support applied to 2.2 cherry-picked from 2.0
 2018-12-18 16:38:54 -05:00
Chad Pilkey
a42466961a [HTML5] create RTCPeerConnection with sdpSemantics:plan-b for Chrome unified-plan 2018-12-18 13:29:42 -08:00
Chad Pilkey
c4554211f1 create RTCPeerConnection with sdpSemantics:plan-b for Chrome unified-plan 2018-12-18 13:29:09 -08:00
João Francisco Siebel
8ecab69821 Merge remote-tracking branch 'upstream/master' into chat-old-messages-re-render 2018-12-18 15:48:11 -02:00
Anton Georgiev
9428358f63
Merge pull request #6272 from KDSBrowne/2.2-panel-manager 
Add panel manager
 2018-12-18 11:57:13 -05:00
KDSBrowne
97ee9932b3 add else blocks 2018-12-18 15:54:20 +00:00
KDSBrowne
f5a928e22e open public chat on join (desktop / tablet) 2018-12-18 15:47:47 +00:00
KDSBrowne
86c7e745c5 fix lint errors 2018-12-18 15:15:51 +00:00
Anton Georgiev
50f5c25dd1
Merge pull request #6431 from prlanzarin/fix-viewer-reconn 
Fixed HTML5 viewer cam reconnections
 2018-12-18 10:08:24 -05:00
prlanzarin
79ae352e2d Fixed HTML5 viewer cam reconnections 2018-12-18 14:55:04 +00:00
Anton Georgiev
7cb7a3a9f3
Merge pull request #6429 from Tainan404/issue-6424 
Fix countdown doesn't appearing in breakout room
 2018-12-18 06:54:29 -05:00
Tainan Felipe
66bf810002 Fix countdown doesn't appearing in breakout room 2018-12-18 09:04:23 -02:00
KDSBrowne
0b0e587e2b make chat open by default on desktop, closed on mobile phones 2018-12-18 03:28:47 +00:00
Anton Georgiev
7eefeee9f9
Merge pull request #6410 from zhu/zhu-fix-toast 
fix toast
 2018-12-17 18:00:23 -05:00
Fred Dixon
bd3e1500a8
Merge pull request #6428 from ffdixon/cleanup-labs 
Removed older Labs examples
 2018-12-17 17:58:58 -05:00
Fred Dixon
08f62e8144 Removed older Labs exampls 2018-12-17 16:57:36 -06:00
Fred Dixon
f420a7ef5a
Merge pull request #6427 from ffdixon/update-gemfile 
Update gemfile for Record and Playback
 2018-12-17 17:55:15 -05:00
Fred Dixon
d381cda1a1 Updated nokogiri and rubyzip to later versions 2018-12-17 16:53:38 -06:00
Fred Dixon
c48e5ab6e2 Merge remote-tracking branch 'upstream/master' 2018-12-17 16:48:52 -06:00
Anton Georgiev
a6afd0314c
Merge pull request #6426 from antobinary/fix-6416 
Fix 6416 - Clear All Status not working
 2018-12-17 17:25:40 -05:00
Anton Georgiev
6250d606fd improve style on video-provider 2018-12-17 22:19:26 +00:00
Anton Georgiev
233e9e8b51 close #6416 - clear all status not working 2018-12-17 21:01:23 +00:00
prlanzarin
8e7fe4b50b Removed generic camera errors and improved video-preview gUM error handling 2018-12-17 17:45:57 +00:00
KDSBrowne
13b13d1547 fix double tooltips being rendered 2018-12-17 15:42:38 +00:00
João Francisco Siebel
51b4f5f451 WIP change components to PureComponents and add memo 2018-12-17 09:48:34 -02:00
zhu
304a29be2e Fix ios scrolling when drawing 2018-12-17 17:16:08 +08:00
zhu
fff59e38b4 Revert "Fix ios scrolling when drawing" 
This reverts commit 83d5617109.
 2018-12-17 17:13:57 +08:00
Anton Georgiev
1d4b21d9f7 handle meeting not found 2018-12-14 22:33:52 +00:00
Anton Georgiev
e2d11f1bec
Merge pull request #6405 from antobinary/fix-end-meeting 
Improve format of callbacks on collection document removal (to address exception)
 2018-12-14 15:50:45 -05:00
Anton Georgiev
d12c01fb14
Merge pull request #6377 from KDSBrowne/hide-toolbar-onSwap 
Hide presentation controls in swapped state
 2018-12-14 15:32:48 -05:00
Anton Georgiev
afa1a64e79 improve format of callbacks on collection document removal 2018-12-14 20:19:10 +00:00
KDSBrowne
899c613c3c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-12-14 17:28:30 +00:00
Richard Alam
5633479955
Merge pull request #6398 from riadvice/fix-akka-packaging 
Make akka-bbb-apps runnable for developers without breaking the packaging
 2018-12-13 17:33:23 -05:00
Anton Georgiev
33f6d07cfe
Merge pull request #6399 from antobinary/updated-packages-lock 
Reorder controls for font size
 2018-12-13 17:27:40 -05:00
Ghazi Triki
b3ce26f753 Use the packaged logback configuration. 2018-12-13 22:55:45 +01:00
Anton Georgiev
2258981559 revert controls for font size Close #6361 2018-12-13 21:47:43 +00:00
Ghazi Triki
dde9419ca4 Make akka-bbb-apps runnable for developers while keeping the packaging intact. 2018-12-13 22:29:05 +01:00
Anton Georgiev
00aba8fc7a
Merge pull request #6395 from antobinary/updated-packages-lock 
Update package-lock.json
 2018-12-13 15:46:45 -05:00
Anton Georgiev
63e2245262 update package-lock.json 2018-12-13 20:35:54 +00:00
Anton Georgiev
d80d78589f
Merge pull request #6346 from KDSBrowne/html5-packages-upgrade 
HTML5 packages upgrade
 2018-12-13 14:43:47 -05:00
KDSBrowne
46d29fd553 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-12-13 19:14:52 +00:00