Commit Graph

5254 Commits

Author SHA1 Message Date
Tainan Felipe
2b74ed9d4f Merge remote-tracking branch 'upstream/master' into issue-6260 2018-12-19 16:58:52 -02:00
Anton Georgiev
85d2e162c5
Merge pull request #6404 from Tainan404/issue-6261
Add mobile version to sort user on create breakout rooms
2018-12-19 13:40:07 -05:00
Tainan Felipe
ce974d0740 Fix linter errors 2018-12-19 15:08:01 -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
Chad Pilkey
a42466961a [HTML5] create RTCPeerConnection with sdpSemantics:plan-b for Chrome unified-plan 2018-12-18 13:29:42 -08: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
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
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
Tainan Felipe
ff44815bdc Remove useless code 2018-12-17 13:48:31 -02:00
KDSBrowne
13b13d1547 fix double tooltips being rendered 2018-12-17 15:42:38 +00:00
Tainan Felipe
ee7eb8f582 Add free join checkbox to render 2018-12-17 13:41:50 -02:00
Tainan Felipe
b7f5a1d73b Add random assignment feature 2018-12-17 11:48:42 -02:00
Tainan Felipe
1577f074b1 Remove left over from merge 2018-12-17 08:33:41 -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
Tainan Felipe
2bab07044b Remove merge conflict 2018-12-14 17:02:55 -02:00
Tainan Felipe
18ba3e402f Merge remote-tracking branch 'upstream/master' into issue-6261 2018-12-14 17:01:19 -02: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
Tainan Felipe
b279dac9e9 Add mobile version to sort user on breakout rooms 2018-12-14 10:33:58 -02:00
Anton Georgiev
2258981559 revert controls for font size Close #6361 2018-12-13 21:47:43 +00: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
Anton Georgiev
12745605b4
Merge pull request #6393 from jfsiebel/presenter-default-pod
Set presenter in default pod
🤞
2018-12-13 12:52:46 -05:00
João Francisco Siebel
8ce7f85dde add meetingId to filter results and avoid a bug with multiple meetings 2018-12-13 15:45:46 -02:00
Anton Georgiev
fbb12b055e
Merge pull request #6276 from Tainan404/issue-6262
Add drag & drop grid for breakout rooms
2018-12-13 11:35:24 -05:00
KDSBrowne
775176d9cf Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager 2018-12-12 17:35:22 +00:00
Anton Georgiev
88575ccee8
Merge pull request #6386 from KDSBrowne/remove-active-tooltip
Remove tooltip for active buttons
2018-12-12 09:38:42 -05:00
Anton Georgiev
5f46e9c1f5
Merge pull request #6374 from Tainan404/css-quick-fix
Change the css variable imports to app component
2018-12-12 09:36:56 -05:00
KDSBrowne
f479059668 remove tooltip for active buttons 2018-12-12 14:01:33 +00:00
Tainan Felipe
ad9a7ef50f Add end line 2018-12-12 11:56:45 -02:00
João Francisco Siebel
e4eae33c8a implement setPresenterInPodReqMsg method as attempt to close #6109 and close #5941 2018-12-12 10:28:08 -02:00