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

13325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
perroned
6f69732bb4 Renames useWebRTCIfAvailable to tryWebRTCFirst 2016-09-13 14:34:35 +00: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
Anton Georgiev
62d3658c4f simplify message structure; add info on userid and meetingid 2016-09-12 14:56:17 +00:00
Anton Georgiev
d0a5b7ce51 Merge pull request #3360 from JaeeunCho/dropdown_chg 
HTML5 Dropdown - fixed warnings and added style
 2016-09-09 17:29:11 -04:00
Fred Dixon
06b77169df Merge pull request #3363 from capilkey/caption-tab-light 
Add colour notification to caption tab when locale is switched
 2016-09-08 18:40:07 -04:00
Chad Pilkey
e0699882b6 add colour notification to caption tab when locale is switched 2016-09-08 16:57:01 -04:00
Fred Dixon
aefc0f9e17 Merge pull request #3359 from riadvice/invite-participants-to-breakout-rooms 
Invite participants to existing breakout rooms
 2016-09-08 16:50:52 -04:00
Fred Dixon
a9acc59b33 Merge pull request #3362 from riadvice/close-breakout-rooms-switch-audio-back 
Switch moderator back to the main audio conference when close all breakout rooms button is clicked
 2016-09-08 10:54:53 -04:00
Ghazi Triki
95c577990a Added "getBreakoutRoomInListen" method in Conference.as 2016-09-08 08:55:22 +01:00
Ghazi Triki
1e833b650b Switch moderator back to the main audio conference when close all breakout rooms button is clicked. 2016-09-08 08:46:49 +01:00
JaeeunCho
9b594e8a52 HTML5 Dropdown - fixed warnings and added style 2016-09-07 12:17:15 -07:00
Ghazi Triki
87421753d5 Invite participants to existing breakout rooms. 2016-09-07 17:50:20 +01:00
Anton Georgiev
d5652a8121 Merge pull request #3358 from oswaldoacauan/fix-trigger 
[HTML5] Fix SPACE/ENTER behavior
 2016-09-07 10:47:37 -04:00
Oswaldo Acauan
0d06f98266 Fix SPACE/ENTER behavior 2016-09-07 14:43:54 +00:00
Anton Georgiev
c03f068d16 Merge pull request #3356 from oswaldoacauan/dropdown-modal-refactor 
[HTML5] Refactor of Modal and Dropdown components
 2016-09-07 09:59:12 -04:00
Oswaldo Acauan
c92de43d73 Fix wrong behavior with ENTER/SPACE 2016-09-07 12:04:10 +00:00
Oswaldo Acauan
9b12853a67 Fix wrong behavior with TAB 2016-09-07 11:55:50 +00:00
Fred Dixon
58c96ea040 Merge pull request #3357 from kepstin/recording-cleanup 
Improve detection of corrupt videos via ffprobe
 2016-09-06 19:02:49 -04:00
Calvin Walton
c730681183 Improve detection of corrupt videos via ffprobe 2016-09-06 18:15:31 -04:00
Oswaldo Acauan
942e16951d Remove unused constructor 2016-09-06 19:29:04 +00:00
Oswaldo Acauan
4cef1e85b4 Remove duplicated component 2016-09-06 19:27:02 +00:00
Oswaldo Acauan
86896983c9 Merge remote-tracking branch 'upstream/master' into presentation-upload 
* upstream/master: (30 commits)
  User in not redirected automatically to the logoutURL.
  Fix errors in recording scripts.
  - fix issue where client cannot join using rtmpt
  Remove a few matterhorn references that were missed.
  Update the Gemfile.lock file to match gem changes
  Improve wave length guessing
  Remove a bunch of unused/old audio processing code.
  Drop streamio-ffmpeg from required gems
  Drop old/broken matterhorn script, and old video processing code.
  fix exception with cc localeCode vs. code
  - do not recycle http connection. Use a fresh one for each request to prevent exception    when reusing old connection.
  - comment out record option for breakout rooms pending further testing.
  - change jws failed to start timeout from 60s to 90s. Sometimes it takes about    30s to download the libs especially for those far from the server or those with    slow connection.
  - custom poll was sent to the wrong actor. Route it to the correct meeting actor.
  - propagate meeting metadata from parent to breakout room
  add a fourth help image for mac screenshare
  add property to closed caption transcript model for the locale code
  Added more explanation for Mac FireFox in screenshare-help.html
  - do not display the "Record" label.
  Hide breakout rooms checkbox.
  ...
 2016-09-06 19:10:31 +00:00
Oswaldo Acauan
d88d566d55 Fixes and improvements on the Dropdown and Modal components 2016-09-06 19:10:18 +00:00
Fred Dixon
91343ec3f9 Merge pull request #3355 from riadvice/signout-api-redirection 
User in not redirected automatically to the logoutURL
 2016-09-04 09:14:38 -04:00
Ghazi Triki
1822c0a9de User in not redirected automatically to the logoutURL. 2016-09-04 12:21:54 +01:00
Richard Alam
11e198fa67 Merge pull request #3354 from kepstin/recording-cleanup 
Fix errors in recording scripts.
 2016-09-03 16:13:45 -04:00
Calvin Walton
f112be7638 Fix errors in recording scripts. 
Logger was apparently imported by the matterhorn stuff ?! so move that
to the main library.

Fix a variable reference in sanity.
 2016-09-03 16:08:32 -04:00
Richard Alam
4e56a63f51 Merge pull request #3353 from bigbluebutton/fix-rtmpt-conn 
- fix issue where client cannot join using rtmpt
 2016-09-03 13:40:59 -04:00
Richard Alam
87adffc7ca - fix issue where client cannot join using rtmpt 2016-09-03 10:33:09 -07:00
Fred Dixon
56d3dd24a4 Merge pull request #3351 from kepstin/recording-cleanup 
Remove a few matterhorn references that were missed.
 2016-09-02 17:46:51 -04:00
Calvin Walton
8ede6d06ee Remove a few matterhorn references that were missed. 2016-09-02 17:45:10 -04:00
Fred Dixon
905f675580 Merge pull request #3350 from kepstin/recording-cleanup 
Recording cleanup
 2016-09-02 16:48:48 -04:00
Calvin Walton
13b9022282 Update the Gemfile.lock file to match gem changes 2016-09-02 16:40:27 -04:00