Commit Graph

13228 Commits

Author SHA1 Message Date
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
Oleksandr Zhurbenko
ad5121106f Meteor 1.4.1 2016-08-20 16:28:03 -07: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
Oleksandr Zhurbenko
993b7d2ca2 Added handling for edit_caption_history_message 2016-08-19 21:25:43 -07:00
Oleksandr Zhurbenko
df9b79e52d Fixed a bug with collapsing whitespaces 2016-08-19 21:23:46 -07:00
mmarangoni
72e11bf94f fixed min height, destructured focus method, minor text fixes 2016-08-19 14:58:52 -07: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
Lajellu
19ff007adb Changes logger to NPM package. Makes RedisPubSub and logger run after Meteor.startup 2016-08-19 14:08:46 -07:00
jfederico
0c697d06c8 bbb-lti: Updated grails to 2.5.2 2016-08-19 17:08:05 -04:00
Lajellu
dedaa4e7aa Merge remote-tracking branch 'upstream/master' into config-organization 2016-08-19 13:50:14 -07: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