Jaeeun Cho
|
0eca848647
|
Dropdown with dropdown_v3 branch
|
2016-08-23 12:18:49 -07:00 |
|
Laily Ajellu
|
57543a5e6a
|
Merge remote-tracking branch 'upstream/master' into config-organization
|
2016-08-23 11:52:43 -07:00 |
|
Jaeeun Cho
|
39b5a82611
|
Merge remote-tracking branch 'upstream/master' into dropdown_v3
|
2016-08-23 11:41:04 -07:00 |
|
Matthew Marangoni
|
00ff50112e
|
removed all inline css and css hidden class for screen readers
|
2016-08-23 11:04:49 -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 |
|
Laily Ajellu
|
ce50f58c36
|
HTML5 - removes old settings and changes setting dependant files
|
2016-08-23 07:35:06 -07: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 |
|
Laily Ajellu
|
8e3ef81843
|
Merge remote-tracking branch 'upstream/master' into config-organization
|
2016-08-23 06:55:44 -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 |
|
jfederico
|
b17bf5a5b3
|
bbb-lti: Added datatables to tool view
|
2016-08-22 19:14:51 -04: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 |
|
Laily Ajellu
|
93e0aacd83
|
Merge remote-tracking branch 'upstream/master' into config-organization
|
2016-08-22 12:19:27 -07: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 |
|
Oleksandr Zhurbenko
|
7054b36721
|
Minor corrections
|
2016-08-22 08:34:46 -07: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 |
|
Oleksandr Zhurbenko
|
ab975cd9b7
|
Changed update to upsert for the cursor updates
|
2016-08-20 20:30:38 -07:00 |
|
Oleksandr Zhurbenko
|
576a8b287f
|
Added a check for cursor data
Since it is undefined sometimes
|
2016-08-20 19:59:32 -07:00 |
|
Oleksandr Zhurbenko
|
da70d2cd89
|
Changed CC's split limit to 1,000 characters
|
2016-08-20 19:57:28 -07:00 |
|
Oleksandr Zhurbenko
|
d9ddbfbda6
|
Cleanup, linting, fixed css modules' imports
|
2016-08-20 18:14:12 -07:00 |
|
Oleksandr Zhurbenko
|
f64ed1fd4a
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning
|
2016-08-20 16:37:11 -07:00 |
|