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

13106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
aaf2164b8b Merge pull request #3278 from antobinary/master 
Breakout rooms:change record to checkbox + boolean
 2016-08-11 16:00:59 -04:00
Anton Georgiev
e839d2610b breakout rooms:change record to checkbox + boolean 2016-08-11 19:54:10 +00:00
Anton Georgiev
f7cb97737d ask akka-apps if allowed to start screenshare 2016-08-11 19:18:56 +00:00
Anton Georgiev
02fb1e15da Merge pull request #3274 from oswaldoacauan/connection-status 
Add notification bar and show notification for bad connection status
 2016-08-11 10:04:37 -04: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
Chad Pilkey
a8a9df4144 Ensure invalid CC messages aren't sent to the server after owner change 2016-08-09 13:07:32 -07:00
jfederico
aac104c77d bbb-web: Set defaultMaxUsers=0 in bigbluebutton.properties 2016-08-09 15:24:46 -04:00
Oswaldo Acauan
1dd5aa8ec5 Revert wrong config 2016-08-09 19:23:01 +00:00
Oswaldo Acauan
3a16921a49 Fix typo 2016-08-09 19:22:23 +00:00
Richard Alam
4348a0736a - start jws screen sharing 
- disable webrtc screen sharing
 2016-08-09 17:54:07 +00:00
Oswaldo Acauan
390d00015e Add notification bar and show notification for bad connection status 2016-08-09 16:28:49 +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
f720aa083c Merge pull request #3271 from capilkey/logout-exception 
Fix logout exception
 2016-08-09 10:25:56 -04:00
Chad Pilkey
1e48b75cf7 fix logout exception by delaying function until after Alert closes 2016-08-08 15:49:17 -07: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
Jaeeun Cho
8beec9df6b change Session Leave at SettingsModal 2016-08-05 17:52:04 -04:00
Jaeeun Cho
76d42f2c8c add Session Leave at SettingsModal 2016-08-05 17:36:49 -04:00
Jaeeun Cho
2b4076493c Merge remote-tracking branch 'upstream/master' into dropdown for settings 2016-08-05 17:29:51 -04:00
Jaeeun Cho
a097afe8a0 add dropdown menu for settings 2016-08-05 17:05:15 -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