BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,704 Commits 13 Branches 260 Tags 1.1 GiB
9b9e448b29
Commit Graph

17704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
9b9e448b29 Merge pull request #4276 from ritzalam/add-version-placeholder 
- add build version placeholder
 2017-08-21 10:30:35 -04:00
Richard Alam
3aec506154 - add build version placeholder 2017-08-21 07:24:40 -07:00
Richard Alam
7e7c51b881 Merge pull request #4272 from ritzalam/add-build-version 
- add back way to put build version in client
 2017-08-18 17:55:42 -04:00
Richard Alam
dbc95de135 - add back way to put build version in client 2017-08-18 14:54:47 -07:00
Richard Alam
5f16b22ae1 Merge pull request #4271 from capilkey/minor-client-fixes-2.0 
Increase chat size and set presentation download to false
 2017-08-18 16:56:51 -04:00
Richard Alam
2691b10689 Merge pull request #4270 from kepstin/bbb-20-rec-fixes 
Various recording script fixes & cleanups
 2017-08-18 16:56:09 -04:00
Calvin Walton
1390224efc RnP: Use correct dir to find presentation images 2017-08-18 16:39:18 -04:00
Chad Pilkey
c7f3c0173d set presentation download checkbox default to false 2017-08-18 16:03:00 -04:00
Chad Pilkey
d3f09252f8 bump chat default size from 12 to 14 2017-08-18 16:01:25 -04:00
Calvin Walton
dba5cd9196 Various recording script fixes & cleanups 
This is just a bundle of a few things I've been fixing up in the past
while.

= Workaround for BBB 1.1 beta deskshare timestamp bug

This is unlikely to be used, but I have the code for it, might as
well merge it in.

= Rework video tiling code for ffmpeg

Render video using the 'hstack' and 'vstack' filters rather than the
'overlay' filter. This is somewhat faster, particularly with lots of
videos.

= Etc.

- Remove usage of the streamio-ffmpeg gem.
  The video rendering code has some stuff to directly read 'ffprobe'
  output, so re-use that instead of this gem (which is kind of old and
  has issues with newer ffmpeg versions).

- Don't hardcode the deskshare video area size, pull it from the
  properties file

- Remove some code that worked around missing video end events.
  In some cases this could cause flickering or strange video issues.
  It's no longer strictly needed, the new tiling code doesn't break if
  the seekpoint is after the end of the video.
 2017-08-18 15:24:54 -04:00
Chad Pilkey
c4f1e7b06f Merge pull request #4269 from capilkey/remove-userid-capilization 
Remove userId capital in  AssignPresenter recorded event
 2017-08-18 14:09:53 -04:00
Chad Pilkey
50d617f622 remove userId capital in AssignPresenter recorded event 2017-08-18 14:07:38 -04:00
Richard Alam
69b8e34137 Merge pull request #4268 from kepstin/bbb-20-rec-fixes 
Create a new 2.0 recording playback directory, revert 0.9.0 to old shapes code.
 2017-08-18 13:02:43 -04:00
Richard Alam
a7028f53d5 Merge pull request #4267 from ritzalam/breakout-request-join-url 
Breakout request join url
 2017-08-18 11:35:59 -04:00
Calvin Walton
321119a79e Create a new 2.0 recording playback directory, revert 0.9.0 to old shapes code. 
The new shapes code, required for handling smooth shape updates & multi-user
whiteboard in the 2.0 BigBlueButton, hits a bug in old recordings where
the pencil tool incorrectly used "line" in its shape names, meaning that
there could be both a pencil mark and a line with the same shape name.

The old recording code didn't rely on the shape name to match shapes, since
there was no chance of concurrent shapes. As this is an incompatible playback
change, we need to make a new playback directory for the updated files.
 2017-08-18 11:34:15 -04:00
Richard Alam
b9adb75a0d - show join url button 2017-08-17 14:48:08 -07:00
Richard Alam
c3f159f51d - use breakoutId in message to request for join url 2017-08-17 14:37:42 -07:00
Fred Dixon
f11f7d1d14 Merge pull request #4266 from kepstin/bbb-20-rec-fixes 
RnP: BBB <0.9 also had off-by-one on the undo and clear messages
 2017-08-17 17:30:29 -04:00
Richard Alam
1b1f986152 Merge pull request #4265 from ritzalam/fix-timer-and-conversion 
Fix timer and conversion
 2017-08-17 17:28:54 -04:00
Richard Alam
34f66ea1e3 - oops forgot to commit oooffice wiring 2017-08-17 14:27:16 -07:00
Richard Alam
5ee470a34a - fix bind warning 2017-08-17 14:25:02 -07:00
Richard Alam
6c1945551d - fix rtt timer 2017-08-17 14:24:23 -07:00
Richard Alam
3ade01b276 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-17 12:51:39 -07:00
Calvin Walton
d24c8f8af2 RnP: BBB <0.9 also had off-by-one on the undo and clear messages 2017-08-17 15:44:13 -04:00
Richard Alam
a62742e1e7 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-17 12:41:58 -07:00
Richard Alam
c504acf055 Merge pull request #4262 from kepstin/bbb-20-rec-fixes 
Recording: Set cursor opacity to match BBB flash client
 2017-08-17 15:40:46 -04:00
Ghazi Triki
1a58533024 Updated whiteboard toolbar style. 2017-08-17 20:37:20 +01:00
Ghazi Triki
df41f8e251 Check if connectionManager is not null before disconnecting. 2017-08-17 20:30:13 +01:00
Calvin Walton
04002f687f Revert to the pre-2.0 capitalization of 'userid' in presenter event 2017-08-17 14:29:54 -04:00
Calvin Walton
af4217c53e Set cursor opacity to match BBB flash client 2017-08-17 13:54:42 -04:00
Richard Alam
c8c5d0757c Merge pull request #4261 from kepstin/bbb-20-rec-fixes 
Bbb 20 rec fixes
 2017-08-17 13:43:14 -04:00
Ghazi Triki
1c6abe4ae7 Improve file upload and download features and UI. 2017-08-17 18:37:20 +01:00
Calvin Walton
50bf20f726 Rewrite recording processing handling of shapes, panzooms, cursor 
The old code was very difficult to follow, and I couldn't figure out
a good way to retrofit the BigBlueButton 2.0 undo by shape id and clear
by user id into it - so I rewrote the entire thing instead.

It now generates the shapes.svg, panzooms.xml and cursor.xml all at the
same time during a single pass through the event.xml file. The result
is compatible with the existing recording javascript (at least once a few
minor issues in writing.js were fixed by earlier commits).
 2017-08-17 13:33:00 -04:00
Anton Georgiev
50efdf3066 Merge pull request #4242 from MaximKhlobystov/selenium-multiremote 
[HTML5 Client] Multiple browser sessions in test specs
 2017-08-17 13:29:42 -04:00
Chad Pilkey
95ded61cbe Merge pull request #4260 from capilkey/improve-client-annotation-edit 
Improve client annotation editing speed
 2017-08-17 13:23:10 -04:00
Chad Pilkey
bf153d6efc fix multiuser icon and button visibility 2017-08-17 13:02:06 -04:00
Richard Alam
33479ac3a1 Merge pull request #4259 from ritzalam/upgrade-ooffice-libs 
- upgrade jodconverter lib to get PPT files converted to PDF working
 2017-08-17 12:57:18 -04:00
Richard Alam
63195ec5d2 - upgrade jodconverter lib to get PPT files converted to PDF working 2017-08-17 09:52:37 -07:00
Anton Georgiev
7cddb1b865 Merge pull request #4258 from antobinary/webcams 
Do not send broadcast cam event for existing stream
 2017-08-17 12:21:11 -04:00
Anton Georgiev
19355eef41 Merge pull request #4249 from antobinary/audio-state 
Handle renamed stop_talking_handler event from FreeSWITCH
 2017-08-17 12:20:43 -04:00
Ghazi Triki
0e342c08bb Make full screen button visible only on Firefox. 2017-08-17 17:08:31 +01:00
Calvin Walton
f0304a120a Handle panzoom at same time as slide change correctly. 
Because of the >=, a panzoom at the same time as a slide change was matching
the previous slide rather than the expected new slide.
 2017-08-17 11:59:06 -04:00
Fred Dixon
34fe7e1875 Merge pull request #4257 from ffdixon/update-bbb-conf-centos-2 
Minor updates for CentOS (nc does not have -z option on CentOS 7.3)
 2017-08-17 11:56:18 -04:00
Fred Dixon
85ced4b153 Minor updates for CentOS (nc does not have -z option on CentOS 7.3) 2017-08-17 10:55:05 -05:00
Chad Pilkey
465206dd12 change annotation storage in client for quicker lookup 2017-08-17 11:38:44 -04:00
Richard Alam
6ebeeaf84b Merge pull request #4255 from ritzalam/pause-screenshare 
- allow pausing of screen share
 2017-08-16 20:48:06 -04:00
Richard Alam
b7de8b41a9 - allow pausing of screen share 2017-08-16 17:44:31 -07:00
Richard Alam
c5dca4dcf0 Merge pull request #4254 from ritzalam/fix-screenshare-stops-on-refresh 
Fix screenshare stops on refresh
 2017-08-16 18:01:21 -04:00
Richard Alam
51bf35071f - fix issue where screenshare stops when a viewer joins or refresh the browser 2017-08-16 14:59:40 -07:00
Richard Alam
458d23d0a2 - fix mute all and mute except presenter issue where all users cannot be muted then unmuted 2017-08-16 14:30:36 -07:00