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

12724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
4ecd1adc9f Merge branch 'fixed-presentation-minimizing' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 13:12:42 -02:00
kreismann
8720c9d954 Showing only the deskshare tab while deskshare is running 2016-11-11 15:01:03 -02:00
Pedro Beschorner Marin
888d51abbd Removed unnecessary parameter initialization 2016-11-11 12:20:50 +00:00
kreismann
c7e0f9e5b0 Deskshare has its own whiteboard page 2016-11-10 18:20:00 -02:00
Pedro Beschorner Marin
6384b8c9e8 Priority video will care about its own aspect ratio when positioning itself at videodock 2016-11-10 20:18:40 +00:00
Pedro Beschorner Marin
a7fa62781f Better handling no webcam scenarios. Reverted to the old disabling button logic because I couldnt justify myself any other way 2016-11-08 20:00:10 +00:00
Pedro Beschorner Marin
e288b8271e Fixed videoconf autoStart-skipCheck race condition 2016-11-08 14:55:35 +00:00
Pedro Beschorner Marin
51dc8322f0 Fixed layout lock issues and adjusted shared notes minimized window bar layout 2016-11-07 16:40:21 +00:00
Pedro Beschorner Marin
7d43bed1ff Renamed inactivity metadata ids to fit a naming pattern 2016-11-01 19:58:42 +00:00
Pedro Beschorner Marin
5ad77eda18 Client reading meeting metadata for wont record message 2016-11-01 19:44:56 +00: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
Pedro Beschorner Marin
4331aaa8d6 Any sign of activity will interrupt and clean the inactivity warning message 2016-10-31 17:28:56 +00:00
Pedro Beschorner Marin
1e014f9298 Included metadata reading at server. Setting meeting timeleft and deadline as meta_inactivity-timeleft and meta_inactivity-deadline on create params 2016-10-31 16:51:07 +00:00
Pedro Beschorner Marin
5416d01dcc Syncing note if a problem is detected while patching 2016-10-26 17:25:49 +00:00
Pedro Beschorner Marin
079c24a75f An applause icon that better fit the other hand icons theme 2016-10-24 19:37:47 +00:00
Pedro Beschorner Marin
af7ba7caac Added applause status and fixed icons dimensions and colors 2016-10-24 19:20:01 +00:00
Pedro Beschorner Marin
67189dff4e Sending sharednotes undo and redo status with current documents message as client starts 2016-10-24 15:42:45 +00:00
Pedro Beschorner Marin
cc13708a27 Capturing CTRL-Z and CTRL-Y as undo and redo events 2016-10-24 13:04:55 +00:00
Pedro Beschorner Marin
c2decd1d2a Cleanup 2016-10-21 19:46:32 +00:00
Pedro Beschorner Marin
ddd1459d4c Refactored sharednotes UNDO operation and implemented REDO 2016-10-21 19:33:30 +00:00
Pedro Beschorner Marin
1eb1aea65e More sofisticated control of sharednotes undo button 2016-10-20 19:56:57 +00: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
Pedro Beschorner Marin
758adb3b8e First functional version of sharednotes undo operation 2016-10-20 17:52:37 +00:00
Pedro Beschorner Marin
43c0a1ab17 Stating implementing sharednotes undo and redo 2016-10-17 16:15:23 +00:00
Pedro Beschorner Marin
5648b6c62d Fixed paricipant audio process at flash client 2016-10-17 13:32:34 +00:00
Pedro Beschorner Marin
bd0033eb0e Users media and status buttons alignment 2016-10-17 12:21:59 +00:00
Pedro Beschorner Marin
eb433b34b7 Reverting a small change so moderators will apply the last broadcasted layout as they join 2016-10-13 21:28:55 +00:00
Pedro Beschorner Marin
ab58583470 Fixed shared notes get current document timer initialization 2016-10-13 20:34:52 +00:00
Pedro Beschorner Marin
3055ab2d7e User settings menu as a well positioned menu 2016-10-13 19:22:26 +00:00
Pedro Beschorner Marin
0949a7b69a Mood menu as a well positioned menu 2016-10-13 19:06:31 +00:00
Pedro Beschorner Marin
2440f5e7ae Fixed presentation hidding issue when minimizing window 2016-10-13 16:46:32 +00:00
Pedro Beschorner Marin
8c300ab314 Fixed deskshare actual size boundaries 2016-10-07 17:34:34 +00: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