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

12746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Beschorner Marin
159c44fede Merge pull request #367 from pedrobmarin/merged-playback-speedup 
Merged playback speedup
 2017-01-27 15:26:07 -02:00
Pedro Beschorner Marin
91092e066a Fixed playback when there is no deskshare canvas 2017-01-27 17:01:59 +00:00
Pedro Beschorner Marin
b89a31bb9a Merge remote-tracking branch 'playback-speedup' into mconf 
Conflicts:
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
	record-and-playback/presentation_export/playback/presentation_export/lib/writing.js
 2017-01-26 18:10:20 +00:00
Pedro Beschorner Marin
9cbf1cdc76 Merge pull request #364 from pedrobmarin/fix-sharednotes-paste 
Changed the way we prevent text input in shared notes to fix paste ev…
 2017-01-25 13:47:53 -02:00
Anton Georgiev
87c71f2d86 fix for the case where last voice user was kicked 2017-01-25 00:02:11 -02:00
Felipe Cecagno
3d075f81a5 Merge remote-tracking branch 'mconf/mconf-live0.7.6' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
 2017-01-25 00:01:05 -02:00
Felipe Cecagno
d0a5a2ff28 adjust minimum dimensions of the shared notes window 2017-01-24 21:12:41 -02:00
Felipe Cecagno
e80100b1f7 hide the layout controls when showLayoutTools is false (visible=includeInLayout=false) 2017-01-24 21:12:20 -02:00
Felipe Cecagno
58aaca6d4e update state on FreeswitchConferenceActor when FreeSWITCH automatically stop recording a meeting, so we avoid the condition in which the wav files aren't generated 2017-01-12 16:17:12 -02:00
Felipe Cecagno
c878b13e8b new year 2017! 2017-01-12 14:48:07 -02:00
Chad Pilkey
c4bcd9de2a hack for Chrome 56+ to try and work around transparent Flash blocking 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2017-01-12 14:47:27 -02:00
Pedro Beschorner Marin
980c5d2ad0 Merge pull request #365 from alexandrekreis/mconf 
Whiteboard annotations on deskshare video
 2017-01-03 15:59:25 -02:00
alexandrekreis
8db63f3de1 Merge pull request #3 from pedrobmarin/fix-deskshare-playback 
Fix deskshare playback
 2017-01-03 14:56:32 -02:00
Pedro Beschorner Marin
e5f6ce8185 Make sure to create video element before running Popcorn 2017-01-03 13:13:36 +00:00
Pedro Beschorner Marin
adbb81e1c5 Cleanup 2016-12-21 18:35:21 +00:00
Pedro Beschorner Marin
85fdf9c79f Updated presentation_export with new deskshare features 2016-12-21 17:26:11 +00:00
Pedro Beschorner Marin
9646bd4cef Fixed annotations to work with Chrome 2016-12-21 16:47:42 +00:00
kreismann
4e2dc4077a Fixing deskshare video positioning 
This also fixes deskshare video/user video swap on playback.
 2016-12-20 13:36:02 -02:00
Pedro Beschorner Marin
35b7dd2fd7 Changed the way we prevent text input in shared notes to fix paste events 2016-12-20 14:11:10 +00:00
Pedro Beschorner Marin
25be036ee3 Modified fullscreen video closing method 2016-12-20 10:08:20 -02:00
Pedro Beschorner Marin
8d45252f99 Adapted fullscreen mode to webcam streams 2016-12-19 19:25:33 +00:00
kreismann
f93114e207 Fixing deskshare panzooms 
- Getting slide dimensions to properly set the panzoom event when deskshare stops.
- Sometimes there's a panzoom event with the deskshare image dimension at time=stop_timestamp+0.1. We remove it.
- Little refactoring
 2016-12-19 15:11:32 -02:00
alexandrekreis
4f572960eb Merge pull request #2 from pedrobmarin/deskshare-whiteboard 
Deskshare whiteboard
 2016-12-16 14:59:31 -02:00
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
Felipe Cecagno
1d1b7107e4 update signed java applet 2016-12-04 11:16:32 -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
Pedro Beschorner Marin
5563e607fc Changed loading bar theme 2016-12-02 13:50:00 +00:00
Pedro Beschorner Marin
0248d42179 Updated presentation_export with new deskshare features, loading bar and JSON slides text file 2016-12-01 20:04:06 +00:00
Pedro Beschorner Marin
e5c48cb7be Replaced the playback spinner for a loading bar and included a not-found meeting fallback page 2016-12-01 18:13:26 +00:00
kreismann
fe9fde2330 Getting flv resolution to set deskshare image and pan/zoom dimensions 2016-11-30 16:31:19 -02:00
Pedro Beschorner Marin
b762795cc9 Cleanup 2016-11-29 17:33:05 +00: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
Pedro Beschorner Marin
c8acfbf65a Getting slides associated text from a single JSON file 2016-11-29 14:00:19 +00:00
Felipe Cecagno
a05a7ca642 fix url for shared notes on config.xml 2016-11-20 21:21:26 -02:00
Felipe Cecagno
8f4ca962cc Merge branch 'undo-stack-size' of github.com:pedrobmarin/bigbluebutton into mconf 
Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
 2016-11-20 21:20:16 -02:00
Felipe Cecagno
1ff4d5829e Merge branch 'priority-video-aspect' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 21:19:16 -02:00
Felipe Cecagno
f8b2107ec5 Merge branch 'fix-354' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 21:15:47 -02:00
Felipe Cecagno
3511120022 Merge branch 'fix-38' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 19:23:26 -02:00
Felipe Cecagno
454f8d0284 update strings for the record button tooltip 2016-11-20 19:23:13 -02:00
Felipe Cecagno
7d0d27f020 Merge branch 'wont-record-metadata' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 15:54:38 -02:00
Felipe Cecagno
1014aa77fa changed possible values for inactivity_deadline to (1 minute; 6 hours), and inactivity_timeleft to (30 seconds; 30 minutes); changed client strings related to inactivity 2016-11-20 15:50:42 -02:00
Felipe Cecagno
82a7945886 fix blur after the record notification on the first audio user 2016-11-20 00:56:31 -02:00
Felipe Cecagno
faba97fdee Merge branch 'inactivity-metadata' of github.com:pedrobmarin/bigbluebutton into mconf 
Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
 2016-11-20 00:41:28 -02:00