Pedro Beschorner Marin
140dc1bed7
Merge pull request #377 from pedrobmarin/updated-presentation-export
...
Updated presentation export
2017-02-24 17:55:37 -03:00
Pedro Beschorner Marin
d7a0493da4
Updated presentation_export
2017-02-24 20:03:47 +00:00
Felipe Cecagno
c8a91bc6d4
avoid breaking if there's no deskshare.xml in the published presentation recording
...
Conflicts:
record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
2017-02-24 19:54:40 +00:00
Pedro Beschorner Marin
c44bcaffee
Merge pull request #376 from pedrobmarin/deskshare-recording-refactoring
...
Refactored deskshare video recording
2017-02-24 16:17:12 -03:00
Pedro Beschorner Marin
490ecd2157
Reverting some modifications made in presentation publish script for deskshare video
2017-02-24 13:46:32 +00:00
Pedro Beschorner Marin
3e43602b33
Changed deskshare start/stop matching method
2017-02-23 20:17:16 +00:00
Pedro Beschorner Marin
6787915e0e
Refactored deskshare video recording
2017-02-23 18:21:10 +00:00
Felipe Cecagno
d9fa4c9f09
Merge pull request #374 from alexandrekreis/mconf
...
Removing timeline attribute for deskshare video
2017-02-17 00:32:24 -02:00
alexandre
ccd4bc4268
Removing timeline attribute for deskshare video
...
We don't need it. This causes duplicate chat messages in recording playback.
2017-02-16 17:24:33 -02:00
Pedro Beschorner Marin
f6ee9b281f
Merge pull request #373 from pedrobmarin/adjust-playback-to-old-recordings
...
Adjusting playback to work with old recordings
2017-02-15 11:16:04 -02:00
Pedro Beschorner Marin
7a4cd67fc3
Adjusting playback to work with old recordings
2017-02-14 13:52:44 +00:00
Pedro Beschorner Marin
929f7beda5
Merge pull request #372 from pedrobmarin/minor-translations-fix
...
Adapting some client labels
2017-02-07 09:58:59 -02:00
alexandre
48d5054869
Adapting some client labels
...
- Creating interface messages in locales
- Some translating to brazilian portuguese
2017-02-06 20:53:07 +00:00
Pedro Beschorner Marin
8bacfa0b71
Merge pull request #371 from pedrobmarin/mconf-minor-fixes
...
Mconf minor fixes
2017-02-06 15:09:10 -02:00
Pedro Beschorner Marin
9fe76ce2d8
Avoid record warning if record button is disabled
2017-02-06 16:29:09 +00:00
Pedro Beschorner Marin
8dfd4c9413
Added occitan to language selector
2017-02-06 16:17:23 +00:00
Pedro Beschorner Marin
4ba063f90a
Merge pull request #369 from pedrobmarin/fixed-some-playback-issues
...
Fixed some playback issues
2017-02-01 17:17:31 -02:00
alexandre
dfa5a305cc
Handling deskshare when closing meeting or stop recording
...
Closing the room or stopping recording with an active deskshare was producing an incorrect recording
2017-02-01 16:38:39 +00:00
Pedro Beschorner Marin
efb9082b9d
Hiding deskshare cursor
2017-02-01 14:15:55 +00:00
Pedro Beschorner Marin
b91535741b
Refactored canvas handling
2017-01-31 14:06:38 +00:00
Pedro Beschorner Marin
0647cdf3b1
Fixed NPE and did some cursor drawing refactoring at playback
2017-01-31 13:45:43 +00:00
Felipe Cecagno
2180987813
if language selector is hidden, doesn't include it in the layout
2017-01-30 16:53:42 -02:00
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
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
