Laily Ajellu
|
d3c6cf6a6c
|
Merge remote-tracking branch 'upstream/master' into config-organization
|
2016-08-24 07:22:55 -07:00 |
|
Jaeeun Cho
|
8eddccc66c
|
HTML5 dropdown for settings menu
|
2016-08-24 07:17:30 -07:00 |
|
Anton Georgiev
|
2953697e45
|
Merge branch 'config-organization' of github.com:lajellu/bigbluebutton into html5-audio
|
2016-08-24 13:02:02 +00:00 |
|
Laily Ajellu
|
361ce7f19f
|
HTML5 - adds captions to config file
|
2016-08-23 16:48:11 -07:00 |
|
Laily Ajellu
|
f0cdbfaf2e
|
Fixed merge conflicts
|
2016-08-23 16:45:28 -07:00 |
|
Fred Dixon
|
4d3a623f3a
|
Merge pull request #3318 from jfederico/bbb-lti_fix_newversion
bbb-lti: Some fixes to the UI
|
2016-08-23 19:33:00 -04:00 |
|
Fred Dixon
|
79aec5f1a2
|
Merge pull request #3319 from capilkey/remove-screenshare-autostart
Remove autoStart and autoFullscreen options from new Screenshare Module
|
2016-08-23 19:32:38 -04:00 |
|
Chad Pilkey
|
a3854068e0
|
remove autoStart and autoFullscreen options from the Screenshare module
|
2016-08-23 16:13:20 -07:00 |
|
Jaeeun Cho
|
426d7baba7
|
html5-client dropdown settings menu
|
2016-08-23 15:19:13 -07:00 |
|
jfederico
|
7d8d52ca3c
|
bbb-lti: localised recording format types shown in the list
|
2016-08-23 18:00:23 -04:00 |
|
Anton Georgiev
|
ff8dfb17d4
|
Merge pull request #3302 from OZhurbenko/closed-captioning
Meteor 1.4.1, Closed-Captioning
|
2016-08-23 17:42:01 -04:00 |
|
Laily Ajellu
|
2105e911ef
|
HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js
|
2016-08-23 14:35:28 -07:00 |
|
Laily Ajellu
|
e4e0a61708
|
Merge remote-tracking branch 'upstream/master' into config-organization
|
2016-08-23 14:32:19 -07:00 |
|
jfederico
|
6644a26155
|
bbb-lti: Fixed issues on error page
|
2016-08-23 17:25:27 -04:00 |
|
Richard Alam
|
8130662890
|
Merge pull request #3316 from antobinary/nginx-logging2
Logging to server (to be handled by nginx)
|
2016-08-23 17:09:16 -04:00 |
|
Anton Georgiev
|
01ddc0af4b
|
Merge branch 'closed-captioning' of github.com:ozhurbenko/bigbluebutton into html5-audio
|
2016-08-23 21:07:31 +00:00 |
|
Fred Dixon
|
247da5a07a
|
Merge pull request #3314 from capilkey/screenshare-help-images
Minor fixes to the deskshare publish UI
|
2016-08-23 17:05:30 -04:00 |
|
Fred Dixon
|
2a07b456ed
|
Merge pull request #3317 from ritzalam/start-pause-stop-screen-sharing-with-webrtc
client throws exception when connection to screen share disconnects
|
2016-08-23 17:05:19 -04:00 |
|
Richard Alam
|
bdb1aece3b
|
- fix issue where client throws exception when connection to screen share gets disconnected.
|
2016-08-23 21:02:49 +00:00 |
|
jfederico
|
645e72bcd8
|
bbb-lti: Added format and localisation to date in recording list
|
2016-08-23 16:28:33 -04:00 |
|
Richard Alam
|
a4d9c9c627
|
Merge pull request #3315 from ritzalam/start-pause-stop-screen-sharing-with-webrtc
Start pause stop screen sharing
|
2016-08-23 15:59:45 -04:00 |
|
Anton Georgiev
|
96e54cecd6
|
add explanation for logPattern
|
2016-08-23 19:52:51 +00:00 |
|
Anton Georgiev
|
3560e9447e
|
remove obsolete deskshare config
|
2016-08-23 19:48:38 +00:00 |
|
Anton Georgiev
|
6ba64ed749
|
add new field to config.xml
|
2016-08-23 19:48:25 +00:00 |
|
Richard Alam
|
67cc7709e5
|
- fix issue where bounding box moves a few pixel after every restart of sharing
|
2016-08-23 19:48:21 +00:00 |
|
Anton Georgiev
|
19f0283f39
|
add pattern to filter logging
|
2016-08-23 19:48:06 +00:00 |
|
Chad Pilkey
|
d624203d02
|
Flash deskshare: fix for linux/mac messages, and better pause indicator
|
2016-08-23 12:47:03 -07:00 |
|
Chad Pilkey
|
480ced5cc4
|
add version number to css.swf
|
2016-08-23 12:38:37 -07:00 |
|
Richard Alam
|
7e57e2e130
|
- minimize time it needs to detect that jws died after pausing
|
2016-08-23 19:36:50 +00:00 |
|
Richard Alam
|
2b5a9afe0c
|
- fix bounding box where it goes out of the screen
|
2016-08-23 19:36:01 +00:00 |
|
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 |
|