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

13366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perroned
26ab092182 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/prod/lib/getScreenId.js
 2016-09-21 19:44:42 +00:00
perroned
29606b66fa Enable screenshare 2016-09-21 19:43:52 +00:00
Fred Dixon
8db4544dea Merge pull request #3383 from ffdixon/add-html5-to-restart 
Added check for restarting HTML5 server component
 2016-09-20 11:18:09 -04:00
Fred Dixon
3f4014fe54 Added check for restarting HTML5 server component 2016-09-20 11:16:01 -04:00
Fred Dixon
da8deb1f86 Merge pull request #3377 from riadvice/store-breakout-settings 
Save breakout rooms settings for each sent creation request
 2016-09-20 10:55:15 -04:00
Fred Dixon
10705bfbf0 Merge pull request #3382 from perroned/remove-iframe-domain 
Removes iframe reference to outside domain
 2016-09-20 10:55:04 -04:00
perroned
53f0512589 Removes iframe reference to outside domain 2016-09-20 13:43:06 +00:00
perroned
1392d2e902 Removes iframe reference to outside domain 2016-09-20 13:38:41 +00:00
Richard Alam
f2efe60b89 Merge pull request #3381 from capilkey/switch-linux-ss-images 
Switch linux screenshare images and text to real values
 2016-09-19 12:07:54 -04:00
Chad Pilkey
4d4754aa3e switch linux screenshare images and text to real values 2016-09-19 12:03:28 -04:00
Fred Dixon
e2191a0426 Merge pull request #3379 from ritzalam/fix-poll-voting 
Cast Exception when sending Number from client to Red5
 2016-09-17 10:23:13 -04:00
Richard Alam
e53124c20d Cast Exception when sending Number from client to Red5 
When responding to a poll, the client sends a Number type which gets encoded in Red5
 as a Double. However, we expect an Integer which results in an exception. Cast the
 received Number properly into an Integer.

 I notice too that EditCaptionHistory is sending a Number. In Red5, we should check if
 we received a Double and cast it to Integer properly.
 2016-09-17 07:13:52 -07:00
Ghazi Triki
97ba2e46f6 Reload breakout rooms settings in client if breakout rooms have been created once in the same user session. 2016-09-16 11:07:22 +01:00
Anton Georgiev
3fda13278c Merge pull request #3368 from Gcampes/compact-userlist 
Compact userlist
 2016-09-15 13:55:18 -04:00
Anton Georgiev
61c29ae958 Merge pull request #3373 from KDSBrowne/chat-welcome-message 
HTML5 - Welcome Chat Message Fixed
 2016-09-15 11:16:01 -04:00
Gabriel Carvalho de Campes
a854fe1126 fix issues from github 2016-09-15 09:27:24 -03:00
perroned
6371d476f9 embedding video into html5 2016-09-14 20:25:31 +00:00
perroned
7ca23e44cc Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-html5/imports/startup/server/EventQueue.js
	bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
 2016-09-14 19:30:07 +00:00
Gabriel Carvalho de Campes
0cc29d13b1 Polish code 2016-09-14 14:48:50 -03:00
Richard Alam
620c05ea60 Merge pull request #3374 from ritzalam/do-not-override-screengrab-timestamp 
- Make sure timestamp is generated properly for the frames. The time…
 2016-09-14 13:42:11 -04:00
Richard Alam
45eb073dcd - Make sure timestamp is generated properly for the frames. The timestamp was 
incremented by 200ms per frame resulting in the recorded file to drift for longer
   recordings.
 2016-09-14 17:22:37 +00:00
KDSBrowne
db461591d4 HTML5 Welcome Chat Message Fixed 2016-09-14 07:26:45 -07:00
Richard Alam
f323bb26d2 Merge pull request #3372 from ritzalam/do-not-override-screengrab-timestamp 
Do not override screengrab timestamp
 2016-09-13 17:58:19 -04:00
Fred Dixon
739a4510b0 Merge pull request #3371 from ritzalam/do-not-cache-config-xml 
- changing config.xml requires a bbb restart. Do not cache the confi…
 2016-09-13 17:56:57 -04:00
Richard Alam
2aefda592d - do not overwrite timestamp of screen grab so that recorded file will 
play in sync.
 2016-09-13 21:55:04 +00:00
Fred Dixon
ba483354d2 Merge pull request #3369 from antobinary/html5-audio 
Logging to server: simplify format of the log entry; add userid, meetingid to each entry
 2016-09-13 17:49:08 -04:00
Fred Dixon
7335191c87 Merge pull request #3370 from ritzalam/improve-rtmp-timeout-delay 
Improve rtmp timeout delay
 2016-09-13 17:48:55 -04:00
Richard Alam
591fe8eff8 - changing config.xml requires a bbb restart. Do not cache the config.xml but read it each request. 2016-09-13 21:43:06 +00:00
Richard Alam
c5a4e9a734 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into improve-rtmp-timeout-delay 2016-09-13 21:39:12 +00:00
Richard Alam
783c069379 - make bbb-app reconnect when disconnected 2016-09-13 21:38:31 +00:00
Anton Georgiev
bbe20804cf omit extra info in log line; fix indent 2016-09-13 20:54:45 +00:00
Richard Alam
833ad1f973 - test whether we connect using rtmp or rtmpt. 2016-09-13 20:29:33 +00:00
Fred Dixon
6771c2666f Merge pull request #3365 from perroned/tryWebRTCFirst 
Renames Screenshare module's useWebRTCIfAvailable to tryWebRTCFirst.  This will make it easier for bbb-conf to update config.xml (currently there are two places where we use useWebRTCIfAvailable).
 2016-09-13 15:48:47 -04:00
Gabriel Carvalho de Campes
832fff2f4a Solves issue with dropdown above white surfaces 2016-09-13 16:47:53 -03:00
Jesus Federico
439b80765d Merge pull request #3366 from jfederico/bbb-lti-fix_https_requests 
bbb-lti: Fixed bug in nginx configuration that prevented https of working fine
 2016-09-13 15:02:58 -04:00
jfederico
7e3d02525f bbb-lti: Fixed bug in nginx configuration that prevented https of working fine 2016-09-13 13:53:41 -04:00
Gabriel Carvalho de Campes
4a1a0c6d58 Merge remote-tracking branch 'upstream/master' into compact-userlist 
* upstream/master:
  Update bbb-record to use systemctl to print process status
 2016-09-13 13:29:24 -03:00
Gabriel Carvalho de Campes
60e42db887 Changes methods in user list item 2016-09-13 11:52:03 -03:00
perroned
6f69732bb4 Renames useWebRTCIfAvailable to tryWebRTCFirst 2016-09-13 14:34:35 +00:00
Gabriel Carvalho de Campes
d2adb5ace3 Fix styling issues on user actions 2016-09-13 10:49:56 -03:00
Gabriel Carvalho de Campes
3786b6ea73 Removes old user actions folder 2016-09-13 08:58:55 -03:00
Fred Dixon
cab8e288c2 Merge pull request #3364 from kepstin/recording-cleanup 
Update bbb-record to use systemctl to print process status
 2016-09-12 17:28:20 -04:00
Calvin Walton
5600ddfba4 Update bbb-record to use systemctl to print process status 2016-09-12 17:26:40 -04:00
Gabriel Carvalho de Campes
5f8ce76e1e Removes white line from app service 2016-09-12 17:28:57 -03:00
Gabriel Carvalho de Campes
1ae62c52ca Changes callback handler for show and hide on dropdown component 2016-09-12 17:19:03 -03:00
Gabriel Carvalho de Campes
60d545d434 Removes comment from app service 2016-09-12 17:18:36 -03:00
Gabriel Carvalho de Campes
ce04e64ee8 Merge remote-tracking branch 'upstream/master' into compact-userlist 
* upstream/master:
  add colour notification to caption tab when locale is switched
  Added "getBreakoutRoomInListen" method in Conference.as
  Switch moderator back to the main audio conference when close all breakout rooms button is clicked.
  HTML5 Dropdown - fixed warnings and added style
  Invite participants to existing breakout rooms.
 2016-09-12 17:12:54 -03:00
Gabriel Carvalho de Campes
f4c8282ebf Changes dropdown for actions on userlist 2016-09-12 17:12:20 -03:00
Gabriel Carvalho de Campes
edee8f5097 Removes capitalize from chat title 2016-09-12 17:11:37 -03:00
Gabriel Carvalho de Campes
ab7f31e8b6 Changes to dropdown component 2016-09-12 17:11:03 -03:00