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

13080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabriel Carvalho de Campes
39b4b9676a adds some compact states in the userlist 2016-08-24 18:56:06 +00:00
Fred Dixon
b71a9f59b8 Merge pull request #3309 from capilkey/screenshare-help-images 
Screenshare help images
 2016-08-23 07:11:29 -04:00
Chad Pilkey
4b37d56a1b Merge remote-tracking branch 'upstream/master' into screenshare-help-images 2016-08-22 21:06:47 -07:00
Chad Pilkey
c760b9f9c0 improve screenshare publish UI to provide help text and images 2016-08-22 20:55:56 -07:00
Richard Alam
f51fc2d647 Merge pull request #3308 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
Start pause stop screen sharing with webrtc
 2016-08-22 18:38:40 -04:00
Richard Alam
36fad78d6d - stop sharing when either jws or flash client crashes 2016-08-22 22:36:46 +00:00
Fred Dixon
1f84960257 Merge pull request #3306 from jfederico/bbb-lti_fix_newversion 
bbb-lti: Fixes to the new version
 2016-08-22 17:25:57 -04:00
jfederico
d29dd62801 bbb-lti: Removed non-used plugins 2016-08-22 17:23:45 -04:00
jfederico
6e4ea31268 bbb-lti: Parameters not required for the integration are not send to BBB 2016-08-22 17:22:00 -04:00
jfederico
e1b9ff3ed6 bbb-lti: Fixed issue with a g tag in main.gsp 2016-08-22 16:26:33 -04:00
jfederico
8e95d4498f bbb-lti: CC descriptor now gives a URL for accessing icon as an asset 2016-08-22 16:20:33 -04:00
jfederico
fb5cb27457 bbb-icon: Replaced old icons with new multi-size icon 2016-08-22 16:15:59 -04:00
jfederico
e7d710bf39 bbb-tool: Restored icon.ico 2016-08-22 16:00:37 -04:00
jfederico
4e08fd26ec bbb-tool: Changed the way the assets are rendered 2016-08-22 15:44:24 -04:00
jfederico
3b47072448 bbb-lti: Relocated assets 2016-08-22 15:17:57 -04:00
Richard Alam
7d06fd075c - stop sharing when jws crashes while sharing is paused 2016-08-22 16:01:52 +00:00
Fred Dixon
b309942bf1 Merge pull request #3304 from ffdixon/update-deskshare-help 
Updates to help file for new screen sharing
 2016-08-21 16:20:05 -04:00
Fred Dixon
dcc0af953d Updates to help file for new screen sharing 2016-08-21 16:17:32 -04:00
Fred Dixon
70649f823d Merge pull request #3303 from ffdixon/update-client-nginx 
Added ipv6 support to nginx configuration
 2016-08-21 13:44:45 -04:00
Fred Dixon
435377f6fe Added ipv6 support to nginx configuration 2016-08-21 13:40:23 -04:00
Richard Alam
8f110c74a4 - try to fix issue where sharing doesn't stop when paused and jws crashes 2016-08-20 21:42:32 +00:00
Richard Alam
82f943b783 Merge pull request #3301 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
- make late joiner view screen share stream
 2016-08-20 15:18:56 -04:00
Richard Alam
5ccdbb085b - make late joiner view screen share stream 2016-08-20 19:17:54 +00:00
Richard Alam
caac6ea672 Merge pull request #3300 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
- start, pause, stop screen sharing properly
 2016-08-20 13:58:29 -04:00
Richard Alam
050ecee572 - start, pause, stop screen sharing properly 2016-08-20 17:56:01 +00:00
Fred Dixon
47be7707e3 Merge pull request #3297 from jfederico/bbb-lti_update-grails 
bbb-lti: Updated grails to 2.5.2
 2016-08-19 17:24:25 -04:00
jfederico
0c697d06c8 bbb-lti: Updated grails to 2.5.2 2016-08-19 17:08:05 -04:00
Richard Alam
65605ee3f9 Merge pull request #3296 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
Stop JWS when flash client dies.
 2016-08-19 11:23:56 -04:00
Richard Alam
a82fcd7f7c - end jws when exception occurs 2016-08-19 15:20:04 +00:00
Richard Alam
8e6d7a0274 - remove dialog when jws stops 2016-08-19 15:19:32 +00:00
Richard Alam
46a7723f68 - remove commented out code. 2016-08-19 15:19:09 +00:00
Richard Alam
f42af1565a - stop jws when client crashes. 2016-08-19 15:05:57 +00:00
Richard Alam
c02170f377 - handle timeout when querying screen sharing session. 2016-08-18 21:34:57 +00:00
Richard Alam
b591106aaa - try to detect if the flash client and the jws app are still alive. If one of them 
if dead, end screen sharing.
 2016-08-18 19:49:32 +00:00
Richard Alam
86062ddd4d Merge pull request #3295 from capilkey/cc-message-check 
More closed captioning improvements
 2016-08-18 12:52:44 -04:00
Chad Pilkey
8707a1e44a comment out excessive cc logging 2016-08-18 09:46:04 -07:00
Chad Pilkey
bf7934eb60 fix bug with private chat opening key press detection 2016-08-18 09:43:36 -07:00
Chad Pilkey
602ce706c2 change cc language select from combobox to list 2016-08-18 09:42:58 -07:00
Chad Pilkey
a958739216 switch cc transcript len checks to internal UITextField 2016-08-18 09:41:07 -07:00
Richard Alam
34d8e2fbb3 Merge pull request #3294 from riadvice/breakout-room-logout-fix 
Fix for breakout room logout issue
 2016-08-18 11:55:58 -04:00
Ghazi Triki
6b93bd3130 Block user from joining any breakout room until all of them are created. 2016-08-18 15:12:57 +01:00
Ghazi Triki
9e32890d1b Postpone sending breakout rooms invitations to after all breakout rooms are successfully created. 2016-08-18 08:03:34 +01:00
Richard Alam
10c10ba455 Merge pull request #3293 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
Allow pausing and resuming of screen sharing
 2016-08-17 18:16:44 -04:00
Richard Alam
8103162d61 - try to handle getting disconnected. 2016-08-17 21:51:35 +00:00
Richard Alam
76e7e6d568 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc 2016-08-17 18:44:49 +00:00
Richard Alam
1da50feb5e - cleanup 2016-08-17 18:44:08 +00:00
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