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

21761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
bd1634f81e
Merge pull request #5789 from ritzalam/ritzalam-upload-vtt 
- make text tracks always a json array
 2018-06-29 16:44:03 -04:00
Richard Alam
f62c872353 - make text tracks always a json array 2018-06-29 13:42:59 -07:00
Richard Alam
745419019c
Merge pull request #5787 from ritzalam/merge-latest-20-branch 
Merge latest 20 branch
 2018-06-29 16:26:38 -04:00
Richard Alam
914f36630a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-29 13:25:09 -07:00
Richard Alam
a396791985
Merge pull request #5776 from riadvice/v2.0.x-release-ui-fixes 
V2.0.x release ui fixes
 2018-06-29 15:57:12 -04:00
Richard Alam
29eee15cf0
Merge pull request #5775 from kepstin/log-cleanup 
Improve bigbluebutton cleanup cron job
 2018-06-29 15:56:50 -04:00
Richard Alam
a6b3a3fe5b
Merge pull request #5771 from riadvice/show-custom-layout-name 
Show layout name as in xml file when its name cannot be matched from locale file
 2018-06-29 15:56:29 -04:00
Richard Alam
bf27083ca3 Merge branch 'ritzalam-upload-vtt' into v2.2-dev 2018-06-29 12:28:31 -07:00
Richard Alam
6401bf905d - handle upload of text tracks 2018-06-29 12:27:23 -07:00
Ghazi Triki
c5aea3ec40 Minir client UI fixes 2018-06-29 18:52:14 +01:00
Anton Georgiev
0aa913a245
Merge pull request #5715 from BobakOftadeh/fullscreenAndroid 
Full screen button is only added on Android
 2018-06-29 11:24:28 -04:00
Maxim Khlobystov
abd205d58f
Merge pull request #5732 from MaximKhlobystov/disable-mobile-screenshare 
Disable screenshare init for presenters on mobile devices.
 2018-06-29 11:06:57 -04:00
Anton Georgiev
60a518ed01
Merge branch 'v2.0.x-release' into disable-mobile-screenshare 2018-06-29 11:01:28 -04:00
Calvin Walton
2b3383345e Improve bigbluebutton cleanup cron job 
- Fully clean up temporary stream files for all red5 webapps.
- Also clean up temporary stream files for kurento recordings.
- Add a new, separate variable for controlling maximum time to keep
  log files.
- Clean up old (rotated) log files for red5, tomcat, recording which
  were accumulating.
 2018-06-29 10:49:19 -04:00
Anton Georgiev
2fe38bc936
Merge pull request #5479 from prlanzarin/sfu-opt-audio 
HTML5 WebRTC listen only via Kurento/SFU
 2018-06-29 10:46:56 -04:00
Richard Alam
b9c9120a4e - get caption track 2018-06-28 15:21:06 -07:00
Richard Alam
b9dad9ff19 Merge branch 'upload-vtt' of https://github.com/ritzalam/bigbluebutton into ritzalam-upload-vtt 2018-06-28 14:27:16 -07:00
prlanzarin
6a63887ebb Fixed kurento audio bridge meetingId fetching and removed uneeded object assignments 2018-06-28 18:59:36 +00:00
prlanzarin
d4858b6e70 Fixed userId/userName sending to SFU audio component 
Also did some refactoring to kurento-extension parameters
 2018-06-28 18:50:56 +00:00
Richard Alam
f458cedc7d Merge branch 'ritzalam-implement-meeting-inactivity-timer' into v2.2-dev 2018-06-28 10:33:16 -07:00
Richard Alam
445d16f27c Merge branch 'implement-meeting-inactivity-timer' of https://github.com/ritzalam/bigbluebutton into ritzalam-implement-meeting-inactivity-timer 2018-06-28 10:32:46 -07:00
Ghazi Triki
bb5b4e4079 Show layout name as in xml file when its name cannot be matched from locale file. 2018-06-28 18:15:58 +01:00
Richard Alam
63d43da710
Merge pull request #5770 from ritzalam/merge-latest-20-branch 
Merge latest 20 branch
 2018-06-28 11:37:48 -04:00
Richard Alam
d3af675ef1 Merge branch 'v2.2-dev' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-28 08:34:20 -07:00
Richard Alam
d891a4e85f Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-28 08:30:17 -07:00
Fred Dixon
1ba07296a9 Remove incorrect image 2018-06-27 22:25:17 -04:00
Fred Dixon
8f6e40ed3f
Merge pull request #5763 from ffdixon/bbb-conf-15 
Add additional step to installing PPA for ffmpeg
 2018-06-27 16:45:40 -04:00
Fred Dixon
5bb98daa90 Add additional step to installing PPA for ffmpeg 2018-06-27 15:44:13 -05:00
Fred Dixon
6c82c18904
Merge pull request #5762 from riadvice/chrome-hardware-acceleration 
Update hardware acceleration warning style and help page
 2018-06-27 16:36:31 -04:00
Ghazi Triki
cefd078b0a Update hardware acceleration warning style and help page. 2018-06-27 21:30:25 +01:00
Richard Alam
c92635b209 - cheange text to warn user that meeting is inactive 2018-06-27 12:59:33 -07:00
Richard Alam
0356721627 - clean up printlns 2018-06-27 12:58:49 -07:00
Richard Alam
db80060968 - fix reason ended string 2018-06-27 12:57:36 -07:00
Paulo Lanzarin
7d414e8b7d
Merge branch 'v2.0.x-release' into sfu-opt-audio 2018-06-27 14:44:11 -03:00
prlanzarin
2f5aa09fe5 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-06-27 17:34:33 +00:00
Anton Georgiev
1e1e605d7a
Merge pull request #5722 from antobinary/breakouts-improvements-3 
Improvements to Breakouts on HTML5
 2018-06-27 12:35:16 -04:00
Fred Dixon
224fec5f4c
Merge pull request #5758 from ritzalam/silence-chat-view-exceptions 
- check if chat message is available to prevent NPEs
 2018-06-27 12:20:49 -04:00
Richard Alam
2f727fe085 - check if chat message is available to prevent NPEs 2018-06-27 08:15:47 -07:00
Richard Alam
4f728c651a Merge branch 'antobinary-client-type-get-meetings' into v2.0.x-release 2018-06-27 08:09:34 -07:00
Richard Alam
d8a4a03cd7 Merge branch 'client-type-get-meetings' of https://github.com/antobinary/bigbluebutton into antobinary-client-type-get-meetings 2018-06-27 07:51:43 -07:00
Anton Georgiev
79329d036a set dial-in clientType in html5 client 2018-06-26 20:50:03 +00:00
Anton Georgiev
e2e83e08df plug clientType in UserJoin* messages, not separate ones 2018-06-26 19:27:42 +00:00
Anton Georgiev
67c7b90581 set clientType from Flash clients 2018-06-26 14:13:14 +00:00
Bobak Oftadeh
5ee63a2aef Fixed Package conflicts 2018-06-25 10:01:34 -07:00
Anton Georgiev
80fbebe829
Fix typo in clearing bbb-webrtc-sfu logs 2018-06-25 11:34:29 -04:00
Fred Dixon
34568e0171
Merge pull request #5754 from ffdixon/fix-5725 
Fix #5725
 2018-06-24 18:46:27 -04:00
Fred Dixon
baa2c5bd59 Fix #5725 2018-06-24 17:45:30 -05:00
Fred Dixon
da15f2fe2c
Merge pull request #5753 from ffdixon/bump-version 
Bump version to RC1
 2018-06-24 18:38:46 -04:00
Fred Dixon
d4cd5ae0c4 Bump version to RC1 2018-06-24 17:37:47 -05:00
Fred Dixon
ea5d1d5744
Merge pull request #5752 from ffdixon/bbb-conf-14 
Fixed typo
 2018-06-24 15:56:52 -04:00