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

23228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
João Francisco Siebel
51b4f5f451 WIP change components to PureComponents and add memo 2018-12-17 09:48:34 -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
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
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
Richard Alam
367a621ebf
Merge pull request #6360 from pedrobmarin/rebased-redis-recording 
Includes publish/unpublish/delete API calls as Redis events
 2018-12-13 11:25:05 -05:00
Fred Dixon
a82ef62ee4
Merge pull request #6387 from riadvice/bbb-conf-status 
Better display of BigBlueButton services
 2018-12-12 12:48:25 -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
Richard Alam
d01a3f06f0 Merge branch 'ritzalam-upgrade-to-latest-red5-dec-9-2019' 2018-12-12 08:25:18 -08:00
Richard Alam
9411d178de Merge branch 'upgrade-to-latest-red5-dec-9-2019' of https://github.com/ritzalam/bigbluebutton into ritzalam-upgrade-to-latest-red5-dec-9-2019 2018-12-12 08:07:12 -08:00
Richard Alam
659e1d3de7 Merge branch 'riadvice-2.0-features-like' 2018-12-12 08:05:01 -08:00
Ghazi Triki
e0bfdb525b Longer arrow for long service name. 2018-12-12 16:58:32 +01:00
Ghazi Triki
b6c924215b Better display of BigBlueButton services. 2018-12-12 16:56:02 +01:00
Richard Alam
c3e7a5a3f8 Merge branch '2.0-features-like' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-features-like 2018-12-12 07:45:12 -08: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
Anton Georgiev
37dae81c29
Merge pull request #6384 from antobinary/handle-401-take-3 
Addressing a race condition causing Auth timeout
 2018-12-11 18:48:36 -05:00