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

23152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Anton Georgiev
2539d55048 addressing a race condition causing Auth timeout 2018-12-11 23:46:21 +00:00
Richard Alam
71da5e6cac
Merge pull request #6383 from ritzalam/try-to-fix-akka-logging 
- minimize logging of redis connection
 2018-12-11 17:08:35 -05:00
Richard Alam
3f9dc6655a - minimize logging of redis connection 2018-12-11 14:06:09 -08:00
Richard Alam
2f383512c8
Merge pull request #6382 from ritzalam/try-to-fix-akka-logging 
Try to fix akka logging
 2018-12-11 16:47:16 -05:00
Richard Alam
c69fb9d585 - try to fix logging for akka fsesl 2018-12-11 13:45:45 -08:00
Richard Alam
9a612f7e3d - see if akka-apps package will start logging. 2018-12-11 13:33:07 -08:00
Richard Alam
3d8c176e3f
Merge pull request #6381 from kepstin/archive-delete-events-fix 
Ensure the archiver deletes events from redis for the last segment
 2018-12-11 15:09:44 -05:00
Calvin Walton
beab29d39d Ensure the archiver deletes events from redis for the last segment 
Issue #6338

It looks like there was a logic error in the code that was causing it
to break out of the event deletion loop early when deleting events for
the last (or only) segment in a recording. (In this case, last_index
is -1, so i >= last_index is always true).

The trim_events_for call was always succeeding, so the events were
being removed from the event list (meeting:{ID}:recordings key) even
though the events themselves hadn't been deleted in the loop.

I've moved the trim_events_for call to below the event deletion loop
to ensure that if the archive script is interrupted, the events list
will contain all not-yet-deleted events.
 2018-12-11 14:03:00 -05:00
KDSBrowne
a9023965b0 Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade 2018-12-11 16:59:39 +00:00
KDSBrowne
f16366c305 hide toolbar when presentation is swapped 2018-12-11 16:28:37 +00:00
Richard Alam
089dd792e8
Merge pull request #6370 from riadvice/fix-akka-packaging 
Exclude red5 dependencies from akka and web projects
 2018-12-11 11:05:38 -05:00
Richard Alam
0cd62fd032
Merge pull request #6376 from bigbluebutton/revert-6373-revert-6368-fix-akka-packaging 
Revert "Revert "Fix akka applications packaging configuration""
 2018-12-11 11:02:52 -05:00
Richard Alam
7b63c31317
Revert "Revert "Fix akka applications packaging configuration"" 2018-12-11 10:57:09 -05:00
Ghazi Triki
4a5a1c572c Fix logback dependency fro akka-bbb-apps. 2018-12-11 15:36:42 +01:00
Fred Dixon
60e155920f
Merge pull request #6375 from bigbluebutton/ffdixon-patch-1 
Minor change to test build
 2018-12-11 08:15:14 -05:00
Fred Dixon
75df6406c1
Minor change to test build 2018-12-11 08:15:04 -05:00