BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,871 Commits 13 Branches 260 Tags 1.1 GiB
33393790b3
Commit Graph

12871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
33393790b3 we still need this module (for the moment) 2016-07-29 19:04:38 +00:00
Anton Georgiev
89e48ebd48 add missing part for adding webrtc support to module screenshare 2016-07-29 18:51:08 +00:00
Anton Georgiev
2ae55432fd deskshare transition to webrtc screenshare changes 2016-07-29 16:16:55 +00:00
perroned
a22b21f61b Merge remote-tracking branch 'anton/fix-webrtc-deskshare' into join-components-with-skeleton 2016-07-22 19:36:19 +00:00
perroned
2a23778ea9 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-html5/imports/api/verto/index.js
	bigbluebutton-html5/imports/ui/components/deskshare/service.js
 2016-07-22 19:20:00 +00:00
perroned
c1abe4ac4f Fixes renamed function 2016-07-22 17:31:35 +00:00
Anton Georgiev
a4d173c1a4 fix missing lib for video-broadcast 2016-07-22 15:54:03 +00:00
Fred Dixon
a716cf974c Merge pull request #3235 from capilkey/closed-caption-easier 
Add a language prompt to closed caption dropdown
 2016-07-21 18:14:11 -06:00
Chad Pilkey
00549743ef add a language prompt to closed caption dropdown 2016-07-21 15:48:19 -07:00
Anton Georgiev
01e0c99c58 subscribe for -DESKSHARE in meeting, adjust for liveMeeting 2016-07-20 21:39:36 +00:00
Richard Alam
b5769d03e5 Merge pull request #3232 from ritzalam/fix-issue-with-mac-starting-screenshare 
Cleanup logging
 2016-07-20 16:07:26 -04:00
Richard Alam
640124f582 Merge pull request #3231 from ritzalam/clean-up-screenshare-logs 
Cleanup Logs
 2016-07-20 16:07:16 -04:00
Richard Alam
97bbb3acff Cleanup logging 
Comment out update logs to minimize noise in the logs.
 2016-07-20 20:03:48 +00:00
Richard Alam
cc9f67be42 Cleanup Logs 
Remove filename information when logging as the logger already includes it.
 2016-07-20 19:47:15 +00:00
Richard Alam
a4b8c78ac1 Merge pull request #3223 from pedrobmarin/v1.0.x-release 
Avoid closing client's videoconf module window when reconnecting => #3195 to master
 2016-07-20 10:56:47 -04:00
Richard Alam
1b8ff19ee8 Merge pull request #3230 from riadvice/breakout-rooms-ui-update 
Breakout rooms update related to the users list
 2016-07-20 10:56:09 -04:00
Ghazi Triki
5e876bb4e9 Display multiple breakout rooms for a single user. 2016-07-20 13:47:31 +01:00
Richard Alam
acaa1ab1e6 Merge pull request #3229 from ritzalam/fix-issue-with-mac-starting-screenshare 
Screenshare issue when starting first time on Mac
 2016-07-19 15:19:06 -04:00
Richard Alam
c0397a0081 Screenshare issue when starting first time on Mac 
Fred is still running into the issue. Add more logs to figure out the sequence
 of events when sharing starts.
 2016-07-19 19:17:27 +00:00
Richard Alam
7f65fcd4ed Merge pull request #3228 from capilkey/better-pencil-tracking 
Better pencil tracking
 2016-07-19 14:18:13 -04:00
Chad Pilkey
02dd8701dc commented out excessive Flash logs 2016-07-19 10:27:46 -07:00
Chad Pilkey
7b75de156a update pencil tracking 2016-07-19 10:26:10 -07:00
Fred Dixon
40f9c24375 Merge pull request #3227 from ritzalam/fix-issue-with-mac-starting-screenshare 
Fix issue with mac starting screenshare
 2016-07-19 10:56:21 -06:00
Richard Alam
dfc58e2a15 - try to fix issue where when sharing desktop on mac for the first time, it fails 
with a network connection exception.
 2016-07-19 16:31:26 +00:00
Ghazi Triki
a2fa88cd20 Fix breakout room display in users list when the user leaves the breakout room. 2016-07-19 10:10:12 +01:00
Richard Alam
7dd38b94be Merge pull request #3225 from ritzalam/fix-client-loggin 
Fix client logging
 2016-07-18 17:44:48 -04:00
Fred Dixon
f9080afe95 Merge pull request #3226 from capilkey/closed-captioning-fixes 
Closed captioning upgrades
 2016-07-18 15:26:25 -06:00
Chad Pilkey
8b1b3b6fee add caption tabindex and localized strings 2016-07-18 14:17:44 -07:00
Chad Pilkey
027d803770 move caption window to its own layout 2016-07-18 14:17:44 -07:00
Chad Pilkey
d7a3e7f40b update the caption UI to new tabbed design 2016-07-18 14:17:44 -07:00
Chad Pilkey
c8301fe571 add copyright message to caption module files 2016-07-18 14:17:43 -07:00
Richard Alam
3f99fe6f19 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into fix-client-loggin 2016-07-18 20:55:13 +00:00
Richard Alam
18442c37bd - change screenshare logging. 2016-07-18 20:34:51 +00:00
Richard Alam
f67f8c848c - initialize client logging. 2016-07-18 20:34:16 +00:00
Anton Georgiev
7857161198 Merge pull request #3219 from Lajellu/cursorTrack 
Displays cursor to HTML5
 2016-07-18 14:27:25 -04:00
Richard Alam
3926c71850 Merge pull request #3224 from ritzalam/record-breakout-rooms 
Record breakout rooms
 2016-07-18 13:15:31 -04:00
Richard Alam
7882735076 Record breakout rooms 
If the parent meeting is recorded, record also the breakout rooms.
 2016-07-18 17:07:31 +00:00
Lajellu
f1d79376ee Fixes Cursor propTypes 2016-07-18 08:30:04 -07:00
Lajellu
3009bed119 Merge remote-tracking branch 'upstream/master' into cursorTrack 2016-07-18 08:23:39 -07:00
Richard Alam
b43ec78479 Merge pull request #3222 from riadvice/breakout-rooms-ui-update 
Minor UI tweaks for the breakout rooms.
 2016-07-18 10:47:14 -04:00
Ghazi Triki
dfb23f3f6c Minor UI teaks for the breakout rooms. 2016-07-18 15:44:45 +01:00
Fred Dixon
2ec5c4a3eb Merge pull request #3220 from riadvice/breakout-rooms-ui-update 
Minor layout update for breakout rooms
 2016-07-16 12:44:45 -04:00
Ghazi Triki
3b4a403725 Minor layout update for the BreakoutRoomSettings window and BreakoutRooms list in UsersWindow. 2016-07-15 22:21:03 +01:00
Lajellu
1acdc0a13b Adds cursor xy tracking 2016-07-15 13:50:03 -07:00
Richard Alam
bb9d778689 Merge pull request #3218 from ritzalam/fix-issue-3196 
Fixes #3196
 2016-07-15 16:09:37 -04:00
Richard Alam
991ad6c2b1 Merge pull request #3217 from ritzalam/fix-issue-3204 
Fix issue 3204
 2016-07-15 16:08:43 -04:00
Richard Alam
f66571e899 Fixes issue 3196 
End the breakout rooms when the parent meeting is ended from the API.
 2016-07-15 20:03:24 +00:00
Richard Alam
e0b756cce9 Fix issue 3204 
- Need to pass sessionToken to get stuns for webrtc call.
 2016-07-15 18:05:08 +00:00
Richard Alam
e679288d8a Merge pull request #3213 from jfederico/bbb-web_add-updateRecordings 
bbb-web: added updateRecordings to the API
 2016-07-15 11:19:07 -04:00
Richard Alam
7dc63b9c3a Merge pull request #3216 from ritzalam/add-https-support-for-jws 
Add help on how to use new screenshare
 2016-07-14 15:27:31 -04:00