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

17736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
2dabc95f9c Merge pull request #4288 from kepstin/bbb-20-rec-fixes 
Bbb 20 rec fixes
 2017-08-21 16:49:15 -04:00
Calvin Walton
ba1e0e09c2 RnP: Add image id to shape ids 
This ensures that the same shape in two different images will
get different ids for each, so that the drawing code will handle it
correctly.
 2017-08-21 16:40:53 -04:00
Richard Alam
806e90fbf9 Merge pull request #4287 from ritzalam/shared-notes-font 
- increase default font for shared notes
 2017-08-21 16:35:01 -04:00
Richard Alam
22ac6e8fc1 - increase default font for shared notes 2017-08-21 13:30:43 -07:00
Richard Alam
bd42ec4141 Merge branch 'pedrobmarin-2.0-shared-notes-fixes' into bbb-2x-mconf 2017-08-21 13:19:40 -07:00
Richard Alam
557a9ea1ca Merge branch '2.0-shared-notes-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-2.0-shared-notes-fixes 2017-08-21 13:09:43 -07:00
Richard Alam
f6da20c174 Merge pull request #4284 from ritzalam/hide-rtt 
- hide rtt for now in client as we keep tract of this on the server …
 2017-08-21 16:04:26 -04:00
Richard Alam
5e1283bb22 - hide rtt for now in client as we keep tract of this on the server side 2017-08-21 13:01:52 -07:00
Pedro Beschorner Marin
2cc03d5d54 Avoiding bad resync in shared notes 2017-08-21 19:50:32 +00:00
Richard Alam
a339e5f534 Merge pull request #4283 from ritzalam/shared-notes-window 
- prevent shared notes window from closing as we don't have a way to…
 2017-08-21 15:39:08 -04:00
Richard Alam
b74ba45cfd - prevent shared notes window from closing as we don't have a way to re-open them. 2017-08-21 12:38:03 -07:00
Richard Alam
3219e978e0 Merge pull request #4282 from ritzalam/change-log-target 
- change target name in log element of config.xml so as not to confl…
 2017-08-21 15:10:55 -04:00
Richard Alam
c7a9fa6947 - change target name in log element of config.xml so as not to conflict with "target" on branding during 
post install
 2017-08-21 12:08:49 -07:00
Richard Alam
0dc6fd4af4 Merge pull request #4281 from ritzalam/public-chat-options 
- move public chat save, copy, and clean into chat options box for accessibility
 2017-08-21 14:47:53 -04:00
Calvin Walton
62465d4c47 RnP: Convert BBB 2.0 cursor positions to be relative to viewbox 
In BBB 2.0, the cursor positions are given relative to the page
size (like annotation positions). Since the recording cursors
aren't actually drawn in the page like annotations, it's more
convenient to have them relative to the visible area (viewbox),
so do that conversion.

While I'm in here - since we switched to new incompatible scripts
for BBB 2.0 anyways - remove an extra factor in the cursor positions
in cursor.xml, and just use a simple ratio of width/height instead.
 2017-08-21 14:44:41 -04:00
Richard Alam
f32ede3a5b - move public chat save, copy, and clean into chat options box for accessibility 2017-08-21 11:42:57 -07:00
Pedro Beschorner Marin
06d937958f Setting maximum size to shared notes and pastes 2017-08-21 18:23:33 +00:00
Fred Dixon
f128486be0 Merge pull request #4280 from ffdixon/redirect-bigbluebutton-org 
Added home.html to redirect to bigbluebutton.org when user clicks low…
 2017-08-21 13:59:59 -04:00
Fred Dixon
97148ac99b Added home.html to redirect to bigbluebutton.org when user clicks lower left text 2017-08-21 12:58:58 -05:00
Richard Alam
1a90735675 Merge pull request #4279 from ritzalam/multi-user-cursor 
- show name beside cursor only when multi-user wb is on
 2017-08-21 13:37:08 -04:00
Richard Alam
d6b4c7ac21 - show name beside cursor only when multi-user wb is on 2017-08-21 10:35:53 -07:00
Richard Alam
043d8f2867 Merge pull request #4278 from ritzalam/minor-ui-adjustments 
- reposition screen share publish window
 2017-08-21 12:29:19 -04:00
Richard Alam
aa35dcddf0 - reposition screen share publish window 
- resize shortcut help window
 2017-08-21 09:27:35 -07:00
Calvin Walton
c925a36c7b RnP: Calculate the cursor position based on pan/zoom info 2017-08-21 12:24:19 -04:00
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
Calvin Walton
08f00eb35e RnP: Fix variable name of bbb 2.0 version check 2017-08-18 17:50:34 -04:00
Calvin Walton
919bb1a60f RnP: Don't unconditionally hide cursor if no updates 2017-08-18 17:45:46 -04:00
Calvin Walton
33a511d800 Move the custom_hash require to publish rap worker where it's used 2017-08-18 17:45:15 -04:00
Calvin Walton
21255cf04a RnP: Hide the cursor when it goes offscreen 
Remove the old 'hide cursor on inactivity' code, and just hide the
cursor when the cursor events say it should be hidden.
 2017-08-18 17:16:16 -04:00
Calvin Walton
f66d4a2849 RnP: Syntax fixes for presentation text fix... 2017-08-18 17:07:14 -04: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
Calvin Walton
2b51f39c62 RnP: Fix issues in presentation publish 
- Need to look in the process dir to find the images (and create new ones)
- Don't set the text attributes on slides that do not have text (logo)
 2017-08-18 16:56:45 -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
Pedro Beschorner Marin
da32a11771 Moving the close button event listener instantiation to the end of the additional shared note window creation 2017-08-18 19:43:35 +00: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
Pedro Beschorner Marin
3f383a8b40 Making role bindable so binding utils will be triggered when it changes 2017-08-18 16:06:02 +00: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