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

21903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
078a745aaa
Merge pull request #5743 from ffdixon/bbb-conf-12 
Add check for ffmpeg
 2018-06-22 15:00:25 -04:00
Fred Dixon
29e0a62533 Add check for ffmpeg 2018-06-22 13:58:30 -05:00
Richard Alam
f2a7e4d314 - display meeting is about to end warning to user and breakout warning if meeting is breakout room 2018-06-22 11:46:46 -07:00
Bobak Oftadeh
9a974c0a56 isAndroid prop is now destructed 2018-06-22 11:45:46 -07:00
Anton Georgiev
2b0ec20491
Merge pull request #5740 from prlanzarin/transcode-4.0 
Fix #5736
 2018-06-22 13:58:10 -04:00
Bobak Oftadeh
48c0ab6d5b Fullscreen button removed if not on Android 2018-06-22 10:20:45 -07:00
prlanzarin
3b3e89b146 Added protocol whitelisting support to akka-transcode RTP_TO_RTMP case 2018-06-22 17:08:04 +00:00
Richard Alam
2fc6d8505d
Merge pull request #5739 from ritzalam/update-locales-jun222018 
- no locales to update
 2018-06-22 10:40:14 -04:00
Richard Alam
578e3acee8 - no locales to update 
- include .tx/config so we can pull locales
 2018-06-22 07:28:29 -07:00
Fred Dixon
4d3996a78c
Merge pull request #5737 from kepstin/bbb-20-rec-fixes 
RaP: Convert aspect ratio numbers to int before checking value
 2018-06-22 10:11:43 -04:00
Calvin Walton
7da493e23f RaP: Convert aspect ratio numbers to int before checking value 
The checks for 0 numerator or denominator were failing due to
type mismatch
 2018-06-22 10:06:34 -04:00
Fred Dixon
2c90559f3f
Merge pull request #5735 from capilkey/improve-chat-scrolling 
Two chat improvements
 2018-06-22 08:13:02 -04:00
Chad Pilkey
1cf9df21b4 stop chat from scrolling back to a selected chat message 2018-06-21 16:44:15 -07:00
Chad Pilkey
b7031b2b71 attempt to improve chat message render performance 2018-06-21 16:42:30 -07:00
Richard Alam
37c2d2bdba
Merge pull request #5733 from ritzalam/merge-latest-20-branch 
- merging latest v20-release branch
 2018-06-21 18:11:01 -04:00
Richard Alam
80ea665049 - send meeting inactivity warning to client 2018-06-21 14:32:41 -07:00
Anton Georgiev
fb66e9420a
Merge pull request #5528 from KDSBrowne/xx.add.Edge-support-html5 
Add support for HTML5 client in Edge
 2018-06-21 13:36:04 -04:00
KDSBrowne
e84b8ab338 apply origional safari audio-overlay position 2018-06-21 17:30:04 +00:00
KDSBrowne
7e9acfb801 remove styles from this.state 2018-06-21 16:33:40 +00:00
Bobak Oftadeh
c3bc5cb67f Passed Android check through container 2018-06-21 09:19:42 -07:00
Maxim Khlobystov
c7464d6dc4 Tiny cleanup. 2018-06-21 11:25:47 -04:00
Maxim Khlobystov
c26de92c16 Disable screenshare init on mobile. 2018-06-21 11:04:00 -04:00
Richard Alam
fc3605f301 - merging latest v20-release branch 2018-06-21 07:38:19 -07:00
KDSBrowne
6edd593fa7 flip arrow icon for edge permission overlay 2018-06-21 01:56:45 +00:00
Fred Dixon
eb89a1e3cf
Merge pull request #5717 from lfzawacki/orientation-recording 
Update bbb-webrtc-sfu packages to use MKV profile for recordings via kurento api
 2018-06-20 18:30:44 -04:00
Fred Dixon
5080903ff1
Merge pull request #5728 from kepstin/bbb-20-rec-fixes 
RaP: Store rendered audio temp file in target directory, not archive_dir
 2018-06-20 18:29:37 -04:00
Fred Dixon
83e40c83c4
Merge pull request #5729 from capilkey/screenshare-loadingbar 
Add a loading bar for WebRTC screenshare start up in the Flash client
 2018-06-20 18:29:26 -04:00
Chad Pilkey
f1443aefa9 add a 15s loading bar for WebRTC screenshare start up in the Flash client 2018-06-20 15:14:02 -07:00
Calvin Walton
67758e1cc9 RaP: Store rendered audio temp file in target directory, not archive_dir 
The archive_dir can by the raw recording directory in some recording
formats - including, hopefully, presentation at some point (to avoid the
extra copy)
 2018-06-20 16:29:49 -04:00
Fred Dixon
02e6c1fad6
Merge pull request #5726 from ritzalam/end-meeting-callback 
Implement end meeting callback url
 2018-06-20 16:17:18 -04:00
Richard Alam
788ca15440 Implement end meeting callback url 
To use, add meta_endcallbackurl parameter on the create api call.
 2018-06-20 13:13:44 -07:00
Anton Georgiev
2002e20b88
Merge pull request #5723 from antobinary/flag-chat-toast 
HTML5: Enable push chat notifications by default
 2018-06-20 13:32:59 -04:00
Anton Georgiev
a7d5f5d698 enable push chat notifications by default 2018-06-20 17:30:04 +00:00
Anton Georgiev
3546e49379 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into breakouts-improvements-3 2018-06-20 16:02:06 +00:00
Anton Georgiev
7b8d568a54 fix redundant offer to join audio re breakouts 2018-06-20 15:36:26 +00:00
Richard Alam
6ec86567eb
Merge pull request #5719 from ritzalam/merge-reroute-client-msgs 
Merge reroute client msgs
 2018-06-20 10:33:57 -04:00
Richard Alam
37acdfcb1f
Merge pull request #5718 from ritzalam/merge-v20-branch 
Merge v20 branch
 2018-06-19 17:47:08 -04:00
Richard Alam
066395c440 - make configurable how client talks to server (default Red5) 2018-06-19 14:40:12 -07:00
Richard Alam
384fdb3e16 Merge branch 'reroute-client-messages' of github.com:ritzalam/bigbluebutton into merge-reroute-client-msgs 2018-06-19 14:28:24 -07:00
Lucas Fialho Zawacki
f2f649df73 Add MKV_VIDEO_ONLY profile to config.default.yml 2018-06-19 17:46:32 -03:00
Lucas Fialho Zawacki
a61d99afac Small corrections to screenshare recording 2018-06-19 17:36:42 -03:00
Lucas Fialho Zawacki
f5d0862f69 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into orientation-recording 2018-06-19 17:19:38 -03:00
Richard Alam
14327a1edf Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch 2018-06-19 12:58:51 -07:00
Bobak Oftadeh
812e3f765a Use of apackage to detect device type 2018-06-19 10:58:20 -07:00
Lucas Fialho Zawacki
c93e2d8379 Update kurento-client-js to use new mkv api 2018-06-19 14:57:09 -03:00
Anton Georgiev
22616a132b reset isEchoTest so value is always correct 2018-06-19 15:40:19 +00:00
Anton Georgiev
634b7b34c7 avoid referencing null on user leave 2018-06-19 15:38:53 +00:00
Anton Georgiev
c8649b1e74 handle unmute required warning 2018-06-19 15:38:09 +00:00
Anton Georgiev
e541e68379
Merge pull request #5711 from Tainan404/issue-5690 
skip share/unshare of flash webcams using "if" instead of "check".
 2018-06-19 10:50:15 -04:00
Anton Georgiev
75ddc19013
Merge pull request #5683 from musickiper/vertically-align-rec-tag-with-sTitle 
Vertically align recording tag with the session title
 2018-06-19 10:04:00 -04:00