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

24061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
9a07f0abd2 fixed mapping of inactivity values 2019-02-25 12:48:46 -08:00
Fred Dixon
bc525baf07
Merge pull request #6848 from pedrobmarin/acorn-load 
Playback loading closed captions
 2019-02-25 12:41:49 -05:00
Fred Dixon
09e0487b19
Merge pull request #6855 from kepstin/rec-event-sort 
Sort events when writing the events.xml file
 2019-02-25 12:40:20 -05:00
Calvin Walton
5d189be062 Sort events when writing the events.xml file 
BigBlueButton can sometimes write events out of order - this particularly
seems to affect the final RecordStatusEvent in a meeting which was ended
while recording was still running. This breaks the recording processing
scripts.

As a workaround, sort the events as they're being written into the events.xml
file. We have the following properties:

* The input data is already mostly sorted
* Items in the wrong position will be no more than a couple spots off from where
  they should be
* We should not change the relative order of events with the same timestamp.

The best algorithm to use here is a simple insertion sort. When adding each new
event to the XML structure, it scans backwards through existing events until it
finds the correct position.

For #6035
 2019-02-25 12:34:29 -05:00
bobakoftadeh
a9119a239e Improve how target is added 2019-02-25 17:01:28 +00:00
Anton Georgiev
c96061425a
Merge pull request #6823 from MaximKhlobystov/feedback-on-logout 
Make feedback work on logout
 2019-02-25 11:38:23 -05:00
Maxim Khlobystov
1816690236 Remove some unnecessary code 2019-02-25 11:33:54 -05:00
Anton Georgiev
9f8faa361f
Merge pull request #6853 from antobinary/presentation-download-1 
Fix incorrect reference in pres isDownloadable
 2019-02-25 08:13:50 -05:00
Anton Georgiev
bba3030df5 fix incorrect reference in pres isDownloadable 2019-02-25 13:12:00 +00:00
Gustavo Trott
c6b725a36b Resolve conflicts 2019-02-25 09:24:00 -03:00
KDSBrowne
b65939a298 improve talking indicators not visible in edge 2019-02-23 23:11:06 +00:00
KDSBrowne
6dbb56fabb provide message on how to escape Etherpad edit field 2019-02-23 22:38:58 +00:00
Fred Dixon
09362e30ad
Bumped to 2.2.0-beta 2019-02-23 09:56:00 -05:00
Fred Dixon
1f5de941e2
Bumped to 2.2.0-beta 2019-02-23 09:55:29 -05:00
bobakoftadeh
2c0d201345 Add target attribute 2019-02-22 22:08:44 +00:00
Anton Georgiev
d415a1911e
Merge pull request #6849 from antobinary/presentation-download-1 
Handle setting presentation as downloadable prior to uploading it
 2019-02-22 16:09:32 -05:00
Anton Georgiev
78ac2c012a handle setting presentation as downloadable prior to uploading it 2019-02-22 21:04:35 +00:00
Pedro Beschorner Marin
4f4f668116 Moving media sync for after screenshare is loaded 2019-02-22 17:46:45 -03:00
Pedro Beschorner Marin
3635cea2b5 Waiting media to be ready before loading acorn controls 2019-02-22 17:46:45 -03:00
Anton Georgiev
3eab376229
Merge pull request #6831 from KDSBrowne/2.2-Edge-avatar-indicator 
Center user avatar icons in Edge
 2019-02-22 11:15:57 -05:00
Anton Georgiev
736dabba78
Merge pull request #6835 from KDSBrowne/2.2-configurable-help-link 
Make the help link configurable
 2019-02-22 11:09:33 -05:00
Anton Georgiev
3003ccf7ab
Merge pull request #6779 from gustavotrott/slide-text-for-accessibility 
Add texts extracted from slides for accessibility
 2019-02-22 11:00:34 -05:00
Anton Georgiev
f9f73fa6a8
Merge pull request #6845 from antobinary/locales-1 
Pulled the latest html5 client locales; added cs_CZ
 2019-02-22 10:08:12 -05:00
Anton Georgiev
144747ddc4 pulled latest html5 locales; added cs_CZ 2019-02-22 15:06:19 +00:00
Anton Georgiev
d4dcc11675 add missing checkbox locale (presentation upload) 2019-02-22 14:56:13 +00:00
Anton Georgiev
d18923974d
Merge pull request #6822 from antobinary/presentation-download 
Presentation download
 2019-02-22 09:03:44 -05:00
Anton Georgiev
ac919bf87b
Remove missed console log 2019-02-22 09:00:28 -05:00
Anton Georgiev
4743b6cf4e added uriEncode for GET param for download presentation 2019-02-21 23:43:11 +00:00
Chad Pilkey
93fe2b6b95
Merge pull request #6837 from capilkey/2.2-escape-audio-names 
Replace double quotes in audio name with single quotes - 2.2 edition
 2019-02-21 17:26:04 -05:00
Anton Georgiev
ef002a2fd1 renamed icon "save_notes" to "download" 2019-02-21 22:15:33 +00:00
Anton Georgiev
f2bd5573f9 remove unused font files; pulled latest fonts 2019-02-21 22:13:57 +00:00
Chad Pilkey
5827ec7ff5 increase call connect timeout and only apply to firefox 2019-02-21 13:58:27 -08:00
Anton Georgiev
a1fc31101c adjusted icons, state for download presentation 2019-02-21 21:10:32 +00:00
Joao Siebel
681df8a546 handle user inactivity inspect on server 2019-02-21 18:09:44 -03:00
Gustavo Trott
3f21c82330 implement quick poll feature 2019-02-21 18:01:39 -03:00
Chad Pilkey
50670365c5 dont log ice closed if user requested hangup 2019-02-21 12:53:39 -08:00
Chad Pilkey
160ea38f5b Replace double quotes in audio name with single quotes 2019-02-21 12:49:04 -08:00
Anton Georgiev
d709387c85
Merge pull request #6821 from capilkey/improved-html5-audio-errors 
Useful HTML5 sip.js bridge errors
 2019-02-21 15:30:36 -05:00
Chad Pilkey
f5a853da84
Merge pull request #6825 from capilkey/2.2chrome-72-extension-check-addendum 
Add defaults for Chrome screenshare link and key to config.xml template
 2019-02-21 15:26:00 -05:00
Anton Georgiev
f896924490
Merge pull request #6791 from jfsiebel/share-video-label 
Update share youtube video label
 2019-02-21 12:32:15 -05:00
Fred Dixon
10085ed3c4
Merge pull request #6816 from kepstin/recording-link-event 
Recording: Fix handling of links in chat messages
 2019-02-20 21:09:49 -05:00
Chad Pilkey
ff90c5815f add defaults for chrome ss link and key to config.xml template 2019-02-20 17:16:20 -08:00
Maxim Khlobystov
2ee75609f9 Use meeting-ended component on logout 2019-02-20 17:57:35 -05:00
Anton Georgiev
a329732e40 WIP localizing presentation-upload 2019-02-20 22:44:44 +00:00
Anton Georgiev
a7c69f6d27 add toggle for presenter to set downloadable for presentations 2019-02-20 22:20:04 +00:00
Chad Pilkey
89b8189087 html5 sipjs bridge has useful errors now 2019-02-20 13:58:37 -08:00
KDSBrowne
7561652c9f center user avatar icon positions in Edge 2019-02-20 20:29:59 +00:00
Anton Georgiev
f620de2585 pulled latest fonts to obtain download-off icon 2019-02-20 19:29:16 +00:00
Anton Georgiev
89225f25a7 include download-presentation-button/* 2019-02-20 19:28:02 +00:00
Anton Georgiev
6cbac32a83
Merge pull request #6813 from Tainan404/issue-6666 
Change flat function to reduce for compatibility with EDGE
 2019-02-20 13:26:21 -05:00