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

12916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghazi Triki
2638e6c9c1 Merge branch 'master' into breakout-rooms-recording 
# Conflicts:
#	akka-bbb-apps/src/main/resources/application.conf
 2016-07-26 17:27:50 +01:00
Ghazi Triki
60463ee8be Put join breakout room before listen to breakout room button. 2016-07-26 17:23:13 +01:00
Anton Georgiev
a47f159b4b Merge pull request #3239 from perroned/fix-verto-console-error 
Fixes unreachable code error
 2016-07-26 10:16:48 -04:00
Ghazi Triki
a62db6c8b4 Breakout rooms uses password from the parent room. 2016-07-25 23:20:31 +01:00
Ghazi Triki
6a6dce2e68 Listen to breakout room is only visible when the user joins the voice conference. 2016-07-25 23:07:13 +01:00
Ghazi Triki
6d0450b64a Update record ComboBox position in BreakoutRoomSettings.mxml 2016-07-25 23:03:42 +01:00
Ghazi Triki
7d2cef9b9f Added recording options for breakout rooms. 2016-07-25 22:31:04 +01:00
perroned
9111a445ad Removes function, removes console error 2016-07-25 21:00:41 +00:00
Fred Dixon
0c0f055427 Merge pull request #3238 from ffdixon/update-bbb-conf-https 
bbb-conf updates bbb-apps-screenshare and bbb-apps-akka with https URLs
 2016-07-25 13:53:37 -03:00
Fred Dixon
4a446146e1 bbb-conf updates bbb-apps-screenshare and bbb-apps-akka with https URLs 2016-07-25 12:51:37 -04:00
Fred Dixon
400392c560 Merge pull request #3237 from ffdixon/remove-newline-from-application-conf 
Removed Windows line feeds from application.conf
 2016-07-24 21:58:15 -06:00
Fred Dixon
7a75773680 Removed Windows line feeds from application.conf 2016-07-24 23:56:26 -04:00
jfederico
a43ae327d0 bbb-demo: Fix for issue on demo12 (configXML). Join doesnt work when using http 2016-07-24 12:27:14 -04:00
jfederico
3763b0da24 bbb-web: Fix for issue #3148 2016-07-22 16:01:28 -04:00
Anton Georgiev
6d8f40fd0e Merge pull request #3234 from oswaldoacauan/userlist-toggle 
[HTML5] Fix user-list toggle
 2016-07-22 15:22:26 -04:00
jfederico
623071005e bbb-web: Simplified action updateRecordings by removing support for force parameter 2016-07-22 11:34:00 -04: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
Oswaldo Acauan
34fedc8e46 Fix user-list toggle 2016-07-21 14:24:50 +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