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

12610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Beschorner Marin
d546621457 Merge remote-tracking branch 'alexandrekreis/mconf' into deskshare-whiteboard 2016-12-16 12:50:09 +00:00
Pedro Beschorner Marin
0223faec5a Positioning cursor over deskshare whiteboard on the playback 2016-12-16 12:49:46 +00:00
alexandrekreis
ff3adecfef Merge pull request #1 from pedrobmarin/deskshare-whiteboard 
Deskshare whiteboard
 2016-12-15 17:07:43 -02:00
Pedro Beschorner Marin
8ca6ecacee Merge remote-tracking branch 'alexandrekreis/mconf' into deskshare-whiteboard 2016-12-15 17:20:08 +00:00
Pedro Beschorner Marin
ac9504fdd2 Annotations over deskshare whiteboard at playback 2016-12-15 17:19:10 +00:00
kreismann
6a29fd832e Handling deskshare on processClearEvents 2016-12-14 14:50:34 -02:00
kreismann
37660e4e13 Fixing some bugs 
- Properly inserting deskshare panzoom events. We insert a panzoom event with the deskshare video dimensions and the deskshare start timestamp. Immediately, we insert another panzoom event with the previous slide dimensions and the deskshare stop timestamp, deleting any other panzoom event inside this interval of time.
- Handling when deskshare events occur in timestamp = 0.0
- For now, we are limiting the max dimensions to 1280x720
 2016-12-12 16:29:06 -02:00
kreismann
be87eeddbd Creating only one image for deskshare 
So we can retrieve deskshare history. Still need to adapt the size of annotations on different deskshare resolutions.
 2016-12-02 17:40:50 -02:00
kreismann
6aeabb9293 Correctly handling multiple deskshare events inside a slide interval of time 2016-12-02 15:34:49 -02:00
kreismann
fe9fde2330 Getting flv resolution to set deskshare image and pan/zoom dimensions 2016-11-30 16:31:19 -02:00
kreismann
e27c291ee0 Recording playback shows whiteboard annotations on deskshare video as well 
Pending issues:
- Image and ViewBox sizes are hardcoded (1280x720 - a full screen deskshare video). In order to work with region deskshare videos, we must get the flvs resolutions and set shapes.svg and panzooms accordingly.
- We're not considering the deskshare annotations history yet
 2016-11-29 15:08:28 -02:00
kreismann
9aef8832c7 Setting current whiteboard id on page change 2016-11-18 13:18:36 -02:00
kreismann
4d13d7e20f Updating poll id and setting polling whiteboard id according to the poll Id 2016-11-17 16:04:19 -02:00
kreismann
66deee9fb2 Fixing some race conditions 
- whiteboard canvas is added to SlideView after a loaded page event;
- We don't load slide annotations while deskshare is active (this situation occurs only in a race condition)
 2016-11-14 17:42:21 -02:00
kreismann
8720c9d954 Showing only the deskshare tab while deskshare is running 2016-11-11 15:01:03 -02:00
kreismann
c7e0f9e5b0 Deskshare has its own whiteboard page 2016-11-10 18:20:00 -02:00
kreismann
c3b0bd46b2 Deskshare video positioning 
Applying slide resizing algorithm to deskshare video as well. Also, removing deskshare-video-area.
 2016-11-01 17:39:06 -02:00
kreismann
73603d5d68 Presentation area of the recording playback also shows deskshare video 
This is a demo. Some issues:

- When sharing desktop, cursor is still relative to slides, and not to deskshare video;
- Need to show whiteboard canvas on top of deskshare video as well;
- Need more testing (audio/video sync, playback perfomance, multiple presenters and multiple deskshare events).
 2016-10-20 17:39:35 -02:00
Felipe Cecagno
ab8eb279a0 Merge pull request #342 from pedrobmarin/recording-events-improvments 
Recording events improvments
 2016-09-29 15:19:50 -03:00
Pedro Beschorner Marin
694c9564a5 Added record_id to redis recording events 2016-09-21 20:12:57 +00:00
Pedro Beschorner Marin
49d5f9c41c Refactored redis recording events 2016-09-21 16:32:11 +00:00
Felipe Cecagno
e39526c180 fix visibility of the download button in the presentation window 2016-09-15 14:29:59 -03:00
Felipe Cecagno
225a25d63c improve locales in the dialog to clean the public chat 2016-09-15 14:11:51 -03:00
Felipe Cecagno
503127b95c add confirmation when the moderator choose to close the session after quit 2016-09-15 14:11:22 -03:00
Felipe Cecagno
9e38f9a279 Merge branch 'merge-presentation-deskshare' into mconf 2016-09-14 15:57:09 -03:00
Felipe Cecagno
bde1597cf4 disable deskshare buttons after clicking it once 2016-09-14 15:20:10 -03:00
Felipe Cecagno
79c3c12256 Merge branch 'merge-presentation-deskshare' into mconf 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
 2016-09-14 14:49:48 -03:00
Pedro Beschorner Marin
20d21ea313 Unregistering Java client deskshare stream 
Conflicts:
	deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/red5/DeskshareApplication.scala
	deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/stream/StreamManager.scala
 2016-09-14 14:01:01 -03:00
kreismann
b961e197c5 Not showing annotation canvas while sharing desktop in recording 
1. We create a deskshare.xml with start and stop timestamps of each deskshare event
2. We read it in playback e use its information to hide the annotation canvas and cursor accordingly
 2016-09-09 18:31:27 -03:00
kreismann
ff966fe2d5 Not loading annotation history when changing tabs 
Loading history generates duplicate annotations, causing an inconsistency on the undo functionality
(Also, a little cleanup)
 2016-09-09 17:12:26 -03:00
Felipe Cecagno
7c53a22bae Merge pull request #341 from pedrobmarin/fix-conf-mate-ulr 
Fixed API Mate URL
 2016-09-09 16:45:48 -03:00
Pedro Beschorner Marin
bd82a036a3 Fixed API Mate URL 2016-09-09 19:28:24 +00:00
kreismann
19cf643bd3 Prevent scrolling on slides tab 2016-09-08 16:56:58 -03:00
Felipe Cecagno
57047b5964 fix bigbluebutton cron job 2016-09-05 12:50:41 -03:00
Felipe Cecagno
4aa2a732e2 Merge branch 'mconf-live0.7.5' of github.com:mconf/bigbluebutton into mconf 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
 2016-09-01 18:00:43 -03:00
Felipe Cecagno
c2a2b7c87a enable mconf-decrypter to fetch the recordings even if mconf-live is using a self-signed certificate 2016-09-01 17:56:55 -03:00
Felipe Cecagno
d5d28e7dc0 Merge pull request #338 from pedrobmarin/fix-bbb-voice-dependency 
Fixed one broken lib in bbb-voice
 2016-09-01 14:13:00 -03:00
Felipe Cecagno
a7978abd03 Merge pull request #337 from pedrobmarin/adapting-freeswitch-1.6.x 
Adjusting configurations to fit FreeSWITCH 1.6.X changes
 2016-09-01 14:12:48 -03:00
Felipe Cecagno
8daaf5d599 Merge pull request #333 from pedrobmarin/fix-video-reconnection 
Fix video reconnection
 2016-09-01 14:11:09 -03:00
Felipe Cecagno
c5917f6a92 update presentation_export playback to be responsive as the playback format 2016-09-01 14:07:33 -03:00
Felipe Cecagno
83d6f37f06 Merge pull request #332 from pedrobmarin/mconf-responsive-playback 
Responsive playback
 2016-09-01 13:49:58 -03:00
Felipe Cecagno
2a68455142 Merge pull request #331 from pedrobmarin/window-dragging-resizing 
Window dragging resizing
 2016-09-01 12:34:07 -03:00
Felipe Cecagno
66ad08e616 Merge branch 'mconf' of github.com:mconf/bigbluebutton into mconf 2016-09-01 12:24:15 -03:00
Felipe Cecagno
b14ad98084 Merge pull request #330 from pedrobmarin/mconf 
Chat time from server
 2016-09-01 12:25:18 -03:00
Pedro Beschorner Marin
00c565d17a Fixed one broken lib in bbb-voice 2016-09-01 13:25:45 +00:00
Pedro Beschorner Marin
66e318cd91 Adjusting configurations to fit FreeSWITCH 1.6.X changes 2016-08-31 19:35:07 +00:00
Felipe Cecagno
d884264852 update Gemfile and Gemfile.lock, will start to deploy Gemfile.lock and execute ruby using bundler 2016-08-18 16:23:33 -03:00
Felipe Cecagno
714aba46ef set to debug some of the new log messages on mconf-decrypter 2016-08-18 16:22:40 -03:00
kreismann
93e0ff8ab5 Warning presenter that his screen is being shared 
To do it, we've put a customized version of VideoWithWarningsBase inside DesktopViewWindow
 2016-08-18 15:50:46 -03:00
Leonardo Crauss Daronco
d860d166df Make mconf-decrypter work with HTTPS and redirects 
It now works with HTTPS URLs and will follow one redirect. The redirect is
useful for when the server being requested redirects HTTP to HTTPS.
 2016-08-16 13:09:19 -03:00