Jaeeun Cho
|
39b5a82611
|
Merge remote-tracking branch 'upstream/master' into dropdown_v3
|
2016-08-23 11:41:04 -07:00 |
|
Fred Dixon
|
4a0026eb2a
|
Merge pull request #3313 from ritzalam/start-pause-stop-screen-sharing-with-webrtc
Start pause stop screen sharing
|
2016-08-23 13:33:41 -04:00 |
|
Richard Alam
|
9f3189f5f1
|
- merged new screen sharing UI
|
2016-08-23 15:21:28 +00:00 |
|
Richard Alam
|
359cc00c66
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc
|
2016-08-23 15:08:41 +00:00 |
|
Richard Alam
|
b7064fc8ea
|
- stop sharing when jws dies
|
2016-08-23 15:07:46 +00:00 |
|
Fred Dixon
|
091a1e5e90
|
Merge pull request #3311 from riadvice/breakout-rooms-welcome-message
Breakout room inherits the welcome message template of its parent room.
|
2016-08-23 10:47:20 -04:00 |
|
Ghazi Triki
|
c41483448c
|
Make breakout rooms inherit the welcome message template of their parent room.
|
2016-08-23 15:40:43 +01:00 |
|
Jaeeun Cho
|
0605c61ba7
|
Merge remote-tracking branch 'upstream/master' into dropdown_v3
|
2016-08-23 07:10:50 -07:00 |
|
Jaeeun Cho
|
add3cb0d9a
|
Dropdown with dropdown_v3 branch
|
2016-08-23 07:05:54 -07:00 |
|
Fred Dixon
|
69512a3b95
|
Merge pull request #3307 from riadvice/breakout-room-ui-imporve
Improvements for breakout rooms names and remaining time display
|
2016-08-23 07:37:00 -04: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 |
|
Ghazi Triki
|
1af78226b8
|
Update remainingtime display in both parent romm and breakout room.
|
2016-08-22 22:11:42 +01: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 |
|
Ghazi Triki
|
9691b413b0
|
Stop camera broadcasting when joining a breakout room.
|
2016-08-22 21:03:23 +01:00 |
|
Ghazi Triki
|
af2d959214
|
Only breakout rooms list names are shown in bold.
|
2016-08-22 21:00:41 +01: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 |
|
Ghazi Triki
|
b1769febaa
|
Fix breakoutRoomTimerBox style.
|
2016-08-22 19:55:57 +01:00 |
|
Ghazi Triki
|
c2c05a6410
|
Change breakout room remaning time format.
|
2016-08-22 18:56:25 +01:00 |
|
Ghazi Triki
|
a16ec795c8
|
Show remaining time for breakout room in bold.
|
2016-08-22 18:48:09 +01:00 |
|
Ghazi Triki
|
5c38b6546b
|
Make breakout room name bold in BreakoutList.mxml
|
2016-08-22 18:42:29 +01:00 |
|
Ghazi Triki
|
f8a62b154b
|
Locale strings update for breakout rooms settings.
|
2016-08-22 18:41:45 +01: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 |
|
Jaeeun Cho
|
47f1447bc4
|
Dropdown with dropdown_v2 branch
|
2016-08-19 17:20:17 -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 |
|