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

13000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
6aab83589a Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1 
Conflicts:
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
 2016-08-17 18:40:28 +00:00
Richard Alam
dd774fabeb - add some comments. 2016-08-17 14:55:51 +00:00
Richard Alam
cc80f1c2ff - trigger starting of screen capture from the server side. 2016-08-16 21:01:41 +00:00
Richard Alam
080a3557c3 - stop jws when user that's sharing gets disconnected 2016-08-16 20:21:29 +00:00
Richard Alam
59d192ee62 - make sure there is only one screen sharing in a meeting. 2016-08-16 17:18:21 +00:00
Richard Alam
12a383cb9d - close jws app when sharing is cancelled (not started) 2016-08-15 21:50:38 +00:00
Richard Alam
9945cb7c5b - stop sharing from the screen share toolbar button. 2016-08-15 20:56:29 +00:00
Richard Alam
9c7759dc73 - display screen share stream 2016-08-15 18:25:56 +00:00
Richard Alam
c3a3bd89bf - generate new streamId from server side when restarting screen sharing. 2016-08-15 17:56:49 +00:00
Anton Georgiev
f7cb97737d ask akka-apps if allowed to start screenshare 2016-08-11 19:18:56 +00:00
Richard Alam
673baa1c84 - reinit restart button label in client. 2016-08-10 21:18:53 +00:00
Richard Alam
4f996890ec - reinit screen share 2016-08-10 21:18:28 +00:00
Richard Alam
bcd34dd57c - add note not to call grabber.stop() 2016-08-10 21:18:00 +00:00
Richard Alam
6e177ef74f Start, pause, stop screen sharing. 2016-08-10 20:48:55 +00:00
Richard Alam
68916c95f6 Allow restart of screen share. 2016-08-10 20:37:19 +00:00
Richard Alam
0138d98f22 - don't exit when pausing screen sharing. 2016-08-10 19:18:49 +00:00
Anton Georgiev
5eccf9297b add send AllowUserToShareDesktopRequest; add bbb-common-messages 2016-08-10 16:10:01 +00:00
Anton Georgiev
c6443f4ed5 set jedis with host+port 2016-08-09 21:58:20 +00:00
Richard Alam
4348a0736a - start jws screen sharing 
- disable webrtc screen sharing
 2016-08-09 17:54:07 +00:00
Richard Alam
5bc2638c47 Merge branch 'perroned-merge-webrtc-screenshare-2' into start-pause-stop-screen-sharing-with-webrtc 2016-08-09 15:33:45 +00:00
Richard Alam
dcd226dc9f Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2016-08-09 14:26:40 +00:00
Richard Alam
9cfbc77699 Add pause sharing client event. 2016-08-08 21:56:39 +00:00
Richard Alam
83c77f5746 Pause screenshare stream 
Add hook to pause screen sharing.
 2016-08-08 20:24:46 +00:00
perroned
a9a448bbdf Removes verto configs from html5 client 2016-08-08 18:32:06 +00:00
Anton Georgiev
250b196bb5 Merge pull request #3255 from Lajellu/presentationControls 
Presentation controls
 2016-08-08 13:18:25 -04:00
Fred Dixon
a233715cda Merge pull request #3270 from kepstin/bbb-11-cron 
Use correct directories and service names in daily cron
 2016-08-08 12:36:59 -03:00
Calvin Walton
db4a731480 Use correct directories and service names in daily cron 
Some of the stuff has gotten moved around in the 1.1 dev process.
 2016-08-08 11:16:51 -04:00
perroned
52d25c93c7 more exact values 2016-08-05 20:42:52 +00:00
Lajellu
33061b3a01 HTML5 slide controls: chgs zoomForm to zoomWrapper and adds a min width to zoomWrapper 2016-08-05 13:40:34 -07:00
Lajellu
76679c9cb9 removes HTML5 whiteboard extra code, whiteboard css trailing space, and rename service in slide controls 2016-08-05 13:13:48 -07:00
Lajellu
94dc0f7c73 Merge remote-tracking branch 'upstream/master' into presentationControls 2016-08-05 13:09:18 -07:00
perroned
59f95747b8 Removes unused functions 2016-08-05 19:54:00 +00:00
Lajellu
41019e81a9 HTML5 slide controls 'order' attribute moved to a higher line 2016-08-05 12:13:37 -07:00
perroned
0e3096d00d Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-08-05 18:45:59 +00:00
perroned
fc8438f61a move some data into verto JS 2016-08-05 18:42:02 +00:00
Lajellu
12ec76d375 Fixes slide control PR comments 2016-08-05 11:39:24 -07:00
Richard Alam
6e9d6656c9 Merge pull request #3266 from riadvice/fix-breakout-room-audio-transfer 
Make listenBtn in RoomActionsRenderer aware of the two different audio states
 2016-08-05 14:17:49 -04:00
Richard Alam
dd79c2537f Merge pull request #3265 from ritzalam/cleanup-screenshare-logging 
Logging
 2016-08-05 13:55:01 -04:00
Ghazi Triki
ecc085b2ca Make listenBtn in RoomActionsRenderer aware of the two different audio states: the user in the audio conference and he is able to transfer & the user is transferred to a breakout room conference. 2016-08-05 18:54:24 +01:00
Richard Alam
4cb817ada5 Logging 
Add more logging to determine if user has successfully shared his desktop or not.
 2016-08-05 17:47:57 +00:00
Lajellu
db371c41a3 Merge remote-tracking branch 'upstream/master' into slideControls 2016-08-05 09:45:06 -07:00
Richard Alam
08eee29898 Merge pull request #3264 from ritzalam/fix-how-clients-get-notified-on-screenshare-started 
Cleanup
 2016-08-05 10:13:25 -04:00
Richard Alam
322328dac6 Remove commented out code. 2016-08-05 14:05:45 +00:00
Richard Alam
2148812e14 Merge pull request #3259 from capilkey/cc-combined-messages 
Make the CC updates smarter
 2016-08-05 10:01:23 -04:00
Richard Alam
871d9d64fa Merge pull request #3263 from ritzalam/transfer-user-to-breakout-room 
Joining voice conf of breakout room
 2016-08-05 10:00:56 -04:00
Richard Alam
8e9b16776c Joining voice conf of breakout room 
A moderator should be able to listen-in on the breakout room. During a previous merge, the
 handler of the transfer message in FSESL was accidentally removed. The user isn't able to
 the breakout room's voice conference anymore.
 2016-08-05 13:58:07 +00:00
Anton Georgiev
832bf2bba7 Merge pull request #3262 from Gcampes/patch-1 
Fixes login in html when flash is not supported
 2016-08-05 09:36:13 -04:00
Gabriel Carvalho de Campes
44c8ae4f59 Fixes login in html when flash is not supported 2016-08-05 10:34:07 -03:00
Chad Pilkey
8eed1b72d8 wait to process transcript updates until after the history has been loaded 2016-08-04 14:59:29 -07:00
Chad Pilkey
23790b4f98 remove empty function in CC OptionsTab 2016-08-04 14:58:52 -07:00