Commit Graph

1354 Commits

Author SHA1 Message Date
Fred Dixon
0a4726bfcf Added check for default stun.freeswitch.org 2020-11-23 07:11:06 -06:00
Anton Georgiev
35032963b9 bump up release to 2.2.30 2020-11-19 14:15:45 -05:00
Lars Kiesow
7a59069958
Allow user bigbluebutton to delete recordings
This patch modifies `bbb-record` allowing the user `bigbluebutton` to
delete recordings. The user has all necessary access rights, meaning
that the deletion works without a problem and the check for root does
not protect anything. The users owns the data after all. The current
check just makes things less convenient.
2020-11-16 23:58:47 +01:00
Lars Kiesow
c7bdfc09c6
Style of bbb-record
Currently, `bbb-record` uses a bunch of different style for indentation,
sometimes tabs, sometimes to, three or four spaces and these are
sometimes mixed on a line by line basis, making it hard to read and to
get what's going on.

This is a simple patch making the style of `bbb-record` consistent by
using three spaces for indentation which seemed to be the most commonly
used type of indentation here.
2020-11-16 23:39:25 +01:00
Mario Jr
ebe9b3a789 Increase private key size for dtls-srtp.pem to 4096
Using this larger value helps reducing ocurrences 1005/1010 errors for Chrome, avoiding an openssl's error which interrupts the dtls handshake (Chrome triggers "DTLS timeout expired" error)
This key size is also the default value used by freeswitch on switch_core_cert.c
2020-11-12 16:59:45 -03:00
Fred Dixon
74186dcd0e Don't check for libreoffice on bionic 2020-10-26 20:43:58 -05:00
Anton Georgiev
a2f437a5b7 Print "BlueButton Server 2.3.0-dev (1383)" as part of bbb-conf --version 2020-10-22 14:40:19 +00:00
Anton Georgiev
be47d732e9 Removed warning for LibreOffice on port 8100 2020-10-22 13:39:15 +00:00
Anton Georgiev
01f5a061ba remove traces of red5 apps, flash client, etc 2020-10-22 13:30:51 +00:00
Anton Georgiev
7df4434c6c
Bump up to 2.2.29 2020-10-21 12:59:21 -04:00
Fred Dixon
47f2b10f2b bbb-webrtc-sfu wait for multiple Kurentos 2020-10-18 14:30:13 -05:00
Anton Georgiev
ac5de5e124
Bump up to 2.2.28 2020-10-14 09:38:30 -04:00
Anton Georgiev
bc478104aa
Bump up to 2.2.27 2020-09-25 16:38:30 -04:00
Fred Dixon
fc73e87597
Bump to 2.2.26 2020-09-23 14:43:47 -04:00
Anton Georgiev
377dc27a8d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 09-16-merge 2020-09-17 14:37:28 +00:00
Fred Dixon
869a4a5c59
Merge branch 'v2.2.x-release' into always-gen-certificate 2020-09-16 10:20:28 -04:00
Fred Dixon
7867bcf725 Always generate certificate for Kurento 2020-09-16 09:17:31 -05:00
Fred Dixon
0d5dbd87b9 Bump to 2.2.25 2020-09-16 08:41:19 -05:00
Fred Dixon
8df5637c56 Ensure the path is always updated 2020-09-16 08:32:08 -05:00
Fred Dixon
1ad1bb0529 Fix #10467 2020-09-16 08:25:06 -05:00
Fred Dixon
fcd3d23126 Fix #10467 2020-09-16 08:23:53 -05:00
Anton Georgiev
612f37fa2b
Added shortcuts for enableHTML5CameraQualityThresholds and enableHTML5WebcamPagination
Added shortcuts for enableHTML5CameraQualityThresholds and enableHTML5WebcamPagination
2020-09-15 14:45:25 -04:00
Fred Dixon
8c21eca5dd properly update ESL password 2020-09-14 16:19:46 -05:00
Fred Dixon
0368dd2c1a Add option for three parallel KMS servers 2020-09-13 11:38:22 -05:00
Fred Dixon
073a63827a Add option for three parallel KMS servers 2020-09-13 11:36:07 -05:00
Fred Dixon
3c37babfeb Add option for three parallel KMS servers 2020-09-13 10:47:28 -05:00
Anton Georgiev
e46e6f4fc4
Bump up version to 2.2.24 2020-09-04 17:18:37 -04:00
timm2k
dacffff831 Also delete opus files in freeswitch cache dir
Only wav files in freeswitch cache directory were deleted. With this PR also opus files are deleted.
2020-08-31 11:02:12 -04:00
timm2k
bcd221b173
Also delete opus files in freeswitch cache dir
Only wav files in freeswitch cache directory were deleted. With this PR also opus files are deleted.
2020-08-28 08:21:00 +02:00
Fred Dixon
65d7e6c954 Remove bbb-transcode-akka from monitoring 2020-08-27 17:13:15 -05:00
Anton Georgiev
7b4124c8d0
Bump up version to 2.2.23 2020-08-21 21:04:03 -04:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
Anton Georgiev
3da55d98c5
Bumped up version to 2.2.22 2020-07-31 19:19:29 -04:00
Fred Dixon
135bf919be
Update bigbluebutton-release 2020-07-27 21:23:27 -04:00
Ghazi Triki
b4c80b8572 Collect more bigbluebutton nginx access logs in bbb-conf --zip 2020-07-15 09:31:45 +01:00
Anton Georgiev
58efe0413f
Bump up release version to 2.2.20 2020-07-10 12:57:12 -04:00
Anton Georgiev
420f8bf0a4 Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-2.3-july-6 2020-07-07 14:13:58 +00:00
Fred Dixon
7d42aa0ea6
Merge pull request #9578 from znerol-forks/feature/develop/config-support-default-server-name
bbb-conf: respect underscore in nginx server_name
2020-07-05 16:02:52 -04:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
Fred Dixon
db9ed99ea7 Ensure ESL password is updated 2020-06-30 12:17:12 -05:00
Fred Dixon
dd29a0d9a1 Bump to update bbb-webrtc-sfu 2020-06-24 08:36:19 -05:00
Fred Dixon
1582625925 Thicken the lines on the first page 2020-06-24 08:35:53 -05:00
Anton Georgiev
8bab72d809
Resolve conflict after merging 2.2 into 2.3 2020-06-23 11:05:07 -04:00
Joao Siebel
3896d0cb5a Remove warning about unsupported defaultGuestPolicy in HTML5 client 2020-06-23 12:01:26 -03:00
mw781
eb29e5b973 Remove trailing whitespace 2020-06-18 13:32:49 +01:00
mw781
fb031c1690 Fix regex issue with firewall troubleshooting 2020-06-18 13:31:10 +01:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Fred Dixon
1d3bfba23b Don't print out new FreeSWITCH ESL password 2020-06-13 06:41:29 -05:00
Fred Dixon
97d3fc9020 Add FreeSWITCH password to bbb-resync-freeswitch 2020-06-13 06:39:46 -05:00
Anton Georgiev
a810aed66c
Bump up BBB version to 2.2.18 2020-06-12 16:46:31 -04:00
Fred Dixon
fa730b726a Update default freeSWITCH ESL Password 2020-06-07 10:48:25 -05:00
Fred Dixon
3d6bedc613 Only check for Java 8 on xenial 2020-06-07 10:22:55 -05:00
Ioannis Cherouvim
15b62f9427
Typo fix on kurento error message. 2020-06-04 10:51:50 +03:00
Anton Georgiev
8183700d39
Bump up BBB version to 2.2.17 2020-06-03 10:44:54 -04:00
Anton Georgiev
f454698cc8
Bump up 2.2 release version 2020-06-01 12:40:47 -04:00
Fred Dixon
268b8cb1b4 Add more blank slides to default presentation 2020-05-30 13:52:50 -05:00
Fred Dixon
6bc9016878
Merge pull request #9663 from ffdixon/bbb-conf-esl
Use the specified ESL password
2020-05-29 12:22:21 -04:00
Anton Georgiev
9b5263e8ce
Merge pull request #9042 from basisbit/patch-2
add missing bbb-restart-kms script which was added to 2.2.3 but is missing in the repo
2020-05-28 16:24:27 -04:00
Anton Georgiev
24ea6b889e
Bump up version number 2020-05-26 10:31:22 -04:00
Anton Georgiev
9f60e925b5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 19:55:36 +00:00
Anton Georgiev
82930ad4bd
Merge pull request #9672 from antobinary/merge-2.2-into-develop
Merge 2.2 into develop, May 25, 2020
2020-05-25 15:44:33 -04:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Fred Dixon
dc4cc11a8a Use the specified ESL password 2020-05-24 11:20:25 -05:00
Anton Georgiev
2f665bb114
Bump up to to a "safe" version number 2020-05-24 08:26:40 -04:00
Fred Dixon
bcf2b83c7f
Update bbb-record
Fix #9652
2020-05-23 12:49:22 -04:00
Fred Dixon
755d161393
Merge pull request #9597 from basisbit/patch-4
Workaround for freeswitch clock out of sync problems
2020-05-22 22:55:26 -04:00
Fred Dixon
e986cc9eba
Merge pull request #9616 from nough/develop
removing /tmp/t_net after --network finished
2020-05-20 21:48:49 -04:00
nough
590341cf1d
removing /tmp/t_net after --network finished
as suggested in https://github.com/bigbluebutton/bigbluebutton/issues/9069
2020-05-20 09:21:26 +01:00
Fred Dixon
aeb6cdd30f
Update bigbluebutton-release
Bump to 2.2.12
2020-05-19 17:56:03 -04:00
Fred Dixon
658676c0fb
Merge pull request #9332 from nough/develop
added port 443 to bbb-conf --network command.
2020-05-19 17:34:08 -04:00
basisbit
7695ead1e8 make bbb-resync-freeswitch executable 2020-05-19 00:50:01 +02:00
basisbit
d2faad3025
add bbb-resync-freeswitch cron.hourly job 2020-05-19 00:42:48 +02:00
znerol
858361b10e Support underscore in nginx server_name 2020-05-17 17:34:20 +02:00
Fred Dixon
0eae639367
Update bigbluebutton-release
Bump to 2.2.11
2020-05-16 10:20:48 -04:00
Fred Dixon
b257e34d9d Check for kurento.sip_ip is correct 2020-05-16 08:45:27 -05:00
Fred Dixon
6f80291637 Bump to 2.2.11-dev 2020-05-16 08:44:50 -05:00
Fred Dixon
76a645c100
Update bigbluebutton-release
Bump to 2.2.11
2020-05-15 12:25:28 -04:00
Fred Dixon
6af3a41c5d
Update bbb-conf
Added display of kurento.sip_ip
2020-05-13 08:39:32 -04:00
beckerr-rzht
c97560bcfd
[FIX] bbb-record --check is broken
`bbb-record --check` always complains about:
```
# The hostname in <link> .. </link> (xxx)
# do not match the hostname for bigbluebutton.web.serverURL
```
This is because `grep` is not able to get the value of the '<link>` tag. 
Since `grep` is always a bad idea when it comes to `xml` files, I'm using `xmlstarlet` as a robust solution.
2020-05-10 18:17:54 +02:00
basisbit
b4825eceb1
enable deletion of 14d old already published raw recordings by default 2020-05-10 04:24:01 +02:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
Fred Dixon
3694c2bd4e
Update bigbluebutton-release 2020-05-03 08:37:32 -04:00
Anton Georgiev
09bbcbb3c9
Bump up release to 2.2.9 2020-04-30 09:33:18 -04:00
Fred Dixon
429eb61047
Update bigbluebutton-release 2020-04-29 09:15:49 -04:00
nough
23508f2727
added port 443 to bbb-conf --network command.
Our BBB instance is fully https encrypted, so there are no connections on port 80, and it seems that flash and therefore port 1935 is fully deprecated. by adding port 443, we can actually see what connections are being made at the moment.
2020-04-29 13:16:28 +01:00
Fred Dixon
4ac33f09bc
Update bigbluebutton-release 2020-04-28 23:49:59 -04:00
Anton Georgiev
0b0e32341a
Update BigBlueButton version to 2.2.6 2020-04-17 09:08:12 -04:00
Fred Dixon
a3d5cbee1d
Update the BigBlueButton release to 2.2.5 2020-04-12 18:04:03 -04:00
basisbit
72764427f7
add missing bbb-restart-kms script which was added to 2.2.3 but is missing in the repo 2020-04-12 12:53:43 +02:00
Anton Georgiev
74767f036d
Update bigbluebutton-release 2020-04-01 16:23:58 -04:00
Fred Dixon
eccbda2fc0 bump release 2020-03-27 16:42:14 -05:00
Fred Dixon
614312804c Update to not use full paths 2020-03-27 09:00:00 -05:00
Fred Dixon
fab9bbd8f6 Bump version after packaging fix for symbolic link /var/kurento -> /var/lib/kurento 2020-03-08 19:39:24 -05:00
Fred Dixon
bd6171cfe7 Revert "Bump to 2.2.2 for adding symbolic link for /var/kurento -> /var/lib/kurento"
This reverts commit 6c571264d9.
2020-03-08 19:36:22 -05:00
Fred Dixon
6c571264d9 Bump to 2.2.2 for adding symbolic link for /var/kurento -> /var/lib/kurento 2020-03-08 19:35:37 -05:00
Fred Dixon
9c260ba31c Bump 2.2.1 2020-03-08 15:58:36 -05:00
Fred Dixon
2f957f5809 Fix version on index.html 2020-03-06 05:30:04 -06:00
Felipe Cecagno
ce3b55d1da update gstreamer was only being triggered by --restart, include it to --setip and --clean 2020-03-05 23:47:42 -03:00
Felipe Cecagno
8e43acdf1f limit execution to xenial; add a TODO to remove it on 2.3 or above 2020-03-05 23:19:45 -03:00
Felipe Cecagno
91fb274c35 do not test a specific version, let it go through all the gstreamer packages 2020-03-05 22:42:21 -03:00
Felipe Cecagno
f6e26cf8af force update gstreamer packages 2020-03-05 22:39:25 -03:00
Fred Dixon
88393b1aa7 Fix #8711 2020-03-05 12:23:53 -06:00
Anton Georgiev
d36c545706 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:41:18 +00:00
Anton Georgiev
8129468300 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:36:21 +00:00
Fred Dixon
76deb09506
Update bigbluebutton-release 2020-03-04 15:44:26 -05:00
Richard Alam
f8437fb19d Merge branch 'v2.2.x-release' of https://github.com/bigbluebutton/bigbluebutton into pres-url-on-page-convert 2020-03-01 05:38:04 -08:00
Fred Dixon
abc4998d2c
Update bigbluebutton-release
Bump to rc-7
2020-02-29 10:42:10 -05:00
Anton Georgiev
3754d0ab6f Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020 2020-02-28 17:47:06 -05:00
Richard Alam
c0372e3a97 Merge branch 'blank-presentation' of https://github.com/riadvice/bigbluebutton into riadvice-blank-presentation 2020-02-28 13:32:02 -08:00
Fred Dixon
0762f04fd7 Fix broken link 2020-02-24 12:34:05 -06:00
Ghazi Triki
0c96050fde Improvements to conversion default fall-back files and process. 2020-02-22 18:26:50 +01:00
Fred Dixon
d8a6099f5e Update to landing page text 2020-02-16 17:40:21 -06:00
Anton Georgiev
4b0452d1fd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master 2020-02-14 21:43:35 +00:00
Fred Dixon
a9f194b038 Bump to RC6 2020-02-04 11:28:01 -06:00
Fred Dixon
98a1b9115e Added start/stop for bbb-rap-caption-inbox.service 2020-01-27 18:37:04 -06:00
Fred Dixon
16f910253b Remove Flash related code 2020-01-25 12:54:12 -06:00
Fred Dixon
c1d2855b32 Update bbb-conf for resque services for record and playback processing 2020-01-20 13:59:54 -06:00
Fred Dixon
e8e11843e4 Remove checks for SWF tools 2020-01-17 19:46:31 -06:00
Calvin Walton
aee7baa76b Merge branch 'v2.0-rap-on-resque' of github.com:daronco/bigbluebutton 2020-01-17 17:40:08 -05:00
Ghazi Triki
9f0ede6d85 Store FreeSwitch logs in bbb-conf --zip. 2019-12-25 16:32:48 +01:00
Ghazi Triki
5d62864b3a Store more logs with bbb-conf --zip. 2019-12-25 15:25:17 +01:00
Fred Dixon
ecc98d824e bump to RC5 2019-12-18 13:42:19 -06:00
Calvin Walton
047f1b84ad Fix 'wget-log' issue in bbb-conf
Switch to using curl instead, which doesn't have this problem (and
outputs to stdout by default, too)
2019-12-17 17:10:09 -05:00
Fred Dixon
605e270727 Bump to RC-3 2019-12-07 13:26:54 -06:00
Leonardo Crauss Daronco
5e05b7a8e8 Fixes for the rap scripts after processing a real recording 2019-12-06 12:26:24 -03:00
Leonardo Crauss Daronco
62d62a2a1e Merge remote-tracking branch 'upstream/master' into v2.0-rap-on-resque
# Conflicts:
#	bigbluebutton-config/bin/bbb-conf
#	record-and-playback/core/Gemfile.lock
#	record-and-playback/core/lib/recordandplayback/events_archiver.rb
#	record-and-playback/core/scripts/archive/archive.rb
#	record-and-playback/core/scripts/bigbluebutton.yml
#	record-and-playback/core/scripts/rap-process-worker.rb
#	record-and-playback/core/scripts/rap-publish-worker.rb
#	record-and-playback/core/scripts/rap-sanity-worker.rb
#	record-and-playback/core/scripts/rap-starter.rb
#	record-and-playback/core/scripts/sanity/sanity.rb
#	record-and-playback/core/systemd/bbb-rap-archive-worker.service
#	record-and-playback/core/systemd/bbb-rap-process-worker.service
#	record-and-playback/core/systemd/bbb-rap-publish-worker.service
#	record-and-playback/core/systemd/bbb-rap-sanity-worker.service
#	record-and-playback/core/systemd/bbb-record-core.target
2019-12-04 17:33:44 -03:00
Fred Dixon
9f43ebd57a Bump master to 2.3.0-dev 2019-11-29 09:53:53 -06:00
Fred Dixon
d29cf3bba8 bump to RC-3 2019-11-29 05:36:48 -06:00
Calvin Walton
13fe03b74f bbb-record: Skip ".norecord" meetings when running --rebuildall
Users don't expect not-recorded meetings to appear when rebuilding
all of their existing recordings.

You can still use bbb-record --rebuild on a single not-recorded
meeting to force it to process.

Fixes #6394
2019-11-20 14:31:55 -05:00
Fred Dixon
0ea6780028 Updates to detect 18.04 2019-11-17 13:01:10 -06:00
Fred Dixon
00221c6be7 Modify bbb-conf for 18.04 2019-11-16 17:35:21 -06:00
Fred Dixon
1daab50634 Bumping to rc-2 2019-11-15 09:15:18 -06:00
Fred Dixon
d0812c1831 First round of updates to support 18.04 2019-11-10 16:29:00 -06:00
Ghazi Triki
0873068c89 Keep html5 client log file permissions. 2019-11-09 18:44:03 +01:00
Fred Dixon
0acc478d36 Bump to RC-1 2019-11-05 14:01:26 -06:00
Fred Dixon
1ddd9a64b0
Merge pull request #8283 from riadvice/update-webhooks-salt
Set IP and shared secret for bbb-webhooks based on the right files.
2019-10-31 13:53:49 -04:00
Ghazi Triki
a15402ffe3 Set IP and shared secret for bbb-webhooks based on the right files. 2019-10-31 17:14:24 +01:00
Ghazi Triki
e8cbf5a3cf Force root user check when assigning a new IP. 2019-10-31 16:47:07 +01:00
Fred Dixon
08ee7f1d55 Bump to version 23 2019-10-24 13:24:24 -05:00
Fred Dixon
a53cf2016f Check that the tomcat7 log directory first exists 2019-10-14 18:57:38 -05:00
Fred Dixon
6b8d1a4c15 Updated bbb-conf for bbb-webhooks 2019-10-13 12:11:16 -05:00
Fred Dixon
b1b544531f Bump to 2.2-beta-21 2019-09-27 17:47:49 -05:00
Fred Dixon
0374f673f5 Add bbb-lti to bbb-conf --restart 2019-09-15 17:42:44 -05:00
Fred Dixon
2f7e56be61 Return https when getting LTI endpoints 2019-09-10 06:44:05 -05:00
Mohamed Amine Ben Salah
1f738fb4d8 updating index page to center and resize input span 2019-09-09 14:53:22 -03:00
Fred Dixon
4782db58d5 Updating index.html page to remove references to Flash 2019-09-08 19:06:53 -05:00
Fred Dixon
c6c1edc0c0 Updating index.html page to remove references to Flash 2019-09-08 19:04:53 -05:00
Fred Dixon
e70af949ea Merge remote-tracking branch 'upstream/master' 2019-09-08 06:31:55 -05:00
Calvin Walton
ceef43241f
Cleanup old bbb-webrtc-sfu logs
The bbb-webrtc-sfu logs are getting rotated, but the old logs just accumulate. Add the directory to the bigbluebutton cron.daily so they get removed.
2019-09-06 10:58:45 -04:00
Fred Dixon
2d73fb9902 Preparing for BigBlueButton 2.2-beta-20 2019-09-06 05:22:49 -05:00
Ghazi Triki
d1d5ffdcdb Make bbb-record count SVG slides. 2019-08-30 15:37:18 +01:00
Fred Dixon
44b5f80600 Don't update kurento[0].url 2019-08-21 12:12:41 -05:00
Richard Alam
09e741ec7d Delete only kurento logs
Do not delete errors.log as it will contain information when KMS crashes.
2019-07-31 12:46:49 -07:00
Ghazi Triki
d3891e7280 Set IP for LTI using bbb-conf 2019-07-27 17:09:31 +03:00
Ghazi Triki
f98001cae2 Updated LTI_DIR variable. 2019-07-27 14:04:15 +03:00
Fred Dixon
92a01f8564
Update bigbluebutton-release 2019-07-25 05:50:14 -04:00
Anton Georgiev
3d97dbaeb7
Update bigbluebutton-release 2019-07-23 14:09:39 -04:00
Fred Dixon
93dea5a719 Fixes #7802 2019-07-18 04:44:32 -05:00
Fred Dixon
d5b1d6abf0
Merge pull request #7728 from riadvice/start-stop-transcode
Fix bbb-transcode-akka not being properly started and stopped.
2019-07-16 21:15:43 -04:00
Ghazi Triki
3eb30641e8 Check bbb-lti service status and delete lti jar check. 2019-07-14 16:36:14 +03:00
Anton Georgiev
496f98077f
Bump up version to 2.2 beta 17 2019-07-12 18:33:16 -04:00
Ghazi Triki
3585998c40 Update all recording types link tags. 2019-07-11 13:47:30 +03:00
Anton Georgiev
3093c75b09
Bump up version to 2.2.0-beta-16 2019-07-08 17:26:26 -04:00
Fred Dixon
28cf3ec9cf
Bump to version 2.2-beta-15 2019-07-07 09:10:26 -04:00
Fred Dixon
ee7d54145d Make release version 14 2019-07-05 14:16:50 -05:00
Fred Dixon
fe0442ce6d Make suggestion match docs 2019-07-05 14:16:29 -05:00
Ghazi Triki
425d1a88b2 Fix bbb-transcode-akka not being properly started and stopped. 2019-07-04 18:54:22 +01:00
Fred Dixon
bd04635309
Update bigbluebutton-release 2019-06-29 17:18:28 -04:00
Fred Dixon
8b27e5c6a0 Fixed typo 2019-06-26 16:44:05 -05:00
Fred Dixon
d824bf04c9 Refer users to docs when not LANG defined for systemctl 2019-06-23 17:22:08 -05:00
Fred Dixon
63058aabc4 Bump to 2.2.0-beta-12 2019-06-23 17:21:19 -05:00
Fred Dixon
ec6306019d Added checks for LANG=en_US.UTF-8 and permissions on /var/bigbluebutton 2019-06-20 20:21:25 -05:00
Fred Dixon
6d0f778e84 Reverted rap scripts for presentation 2019-06-13 19:34:35 -05:00
Fred Dixon
36bf59a9d3 Bump version to 2.2-beta-10 2019-06-13 09:58:47 -05:00
Richard Alam
a46d0b9680 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into captions-text-tracks-intermediate-branch 2019-06-06 15:04:53 -07:00
Fred Dixon
09c43d8818 Don't print warning if tomcat7 is not installed 2019-06-02 21:20:07 -05:00
Richard Alam
9d416ee473 Merge branch 'text-tracks' of https://github.com/riadvice/bigbluebutton into riadvice-text-tracks 2019-05-30 12:30:07 -07:00
Fred Dixon
5bff8ff960 Bump to 2.2-beta9 2019-05-24 16:06:35 -05:00
Felipe Cecagno
d1bc69ba68 fix permissions of bigbluebutton-config utilities 2019-05-21 14:33:46 -03:00
Fred Dixon
10c13e334c Bump to beta8 2019-05-21 06:29:53 -05:00
Ghazi Triki
7204b069e5 Display etherpad service status. 2019-05-16 22:05:16 +01:00
Fred Dixon
8ecefb4b87
Update check-localization-keys.txt
Test commit
2019-05-14 19:21:05 -04:00
Fred Dixon
41ee22432e Bump release 2019-05-14 18:13:21 -05:00
Fred Dixon
22af07df15
Update bbb-conf 2019-05-14 18:57:45 -04:00
Fred Dixon
d926d5f7e1
Update bigbluebutton-release
Bump to the release for beta 7
2019-05-14 08:22:07 -04:00
Ghazi Triki
c0bdba2ff2 bbb-record deletes caption files. 2019-05-13 21:59:08 +01:00
Fred Dixon
ad33cc6c80 Added check for multiple bbb-common-message libs 2019-05-11 13:13:59 -05:00
Fred Dixon
68a236c19a Ignore empty redisPassword fields 2019-05-10 09:43:22 -05:00
Fred Dixon
56eabffa4e Fix error in checking systemd status 2019-05-07 11:21:59 -05:00
Fred Dixon
c1b1712145 Hide tomcat7 warning if tomcat7 not installed 2019-05-06 17:23:23 -05:00
Fred Dixon
557dabb520
Revert to beta6 (previous release was beta5) 2019-04-28 10:04:16 -04:00
Fred Dixon
c45b743273
Bump to beta-7 2019-04-25 21:12:29 -04:00
Calvin Walton
36ff4de20e Clean up old logs from kurento-media-server in cron job 2019-04-17 10:37:05 -04:00
Fred Dixon
a189cfb9a3
Bump release 2019-04-14 12:40:09 -04:00
Fred Dixon
f600f397f1
Improve generation of new shared secret 2019-04-14 10:46:20 -04:00
Fred Dixon
16f5facf0a
Update bigbluebutton-release 2019-04-11 16:46:59 -04:00
Fred Dixon
caa6b9a85e
Fix path for bbb_api_conf.jsp 2019-04-09 20:00:48 -04:00
Fred Dixon
8bfecb0869 Fix check for shared secret mismatch with bbb-demo 2019-04-09 18:54:16 -05:00
Fred Dixon
1e29d04ea9 Added check for default shared secret 2019-04-09 18:14:52 -05:00
Fred Dixon
37829b2d9a Bump to 2.2-beta4 2019-04-08 16:59:10 -05:00
Anton Georgiev
784dd76526
Typo in bbb-conf 2019-04-08 16:52:28 -04:00
Fred Dixon
2e8468a877 Added setHTML5ClientAsDefault and enableUFWRules for configuration 2019-04-03 21:26:10 -05:00
Fred Dixon
6f2323098a
Update bigbluebutton-release 2019-03-29 12:27:50 -04:00
Ghazi Triki
a8c01fe122 Fix clean logs and improve cleaning FreeSwitch logs. 2019-03-26 18:02:38 +01:00
Fred Dixon
0dd4107810
Update bigbluebutton-release 2019-03-26 09:48:50 -04:00
Fred Dixon
660376aa03 Fixed typo in updating settings.yml 2019-03-16 18:19:09 -05:00
Fred Dixon
b34ca1d8b8 update public.note.url on bbb-conf --setip 2019-03-15 18:46:46 -05:00
Fred Dixon
2335c1d8a5 Added more checks to sip.nginx 2019-03-15 18:32:06 -05:00
Fred Dixon
395f5787de Need to specify proper path to apply-lib.sh 2019-03-15 18:29:30 -05:00
Ghazi Triki
2c2c0a1bcc Refactoring to bbb-conf shell script application. 2019-03-14 15:19:13 +01:00
Fred Dixon
f52bb7bd3f Improved detection for centos 2019-03-10 19:35:05 -05:00
Fred Dixon
ec3f568a10 Add check to make sure freeswitch.log exists 2019-03-10 18:23:12 -05:00
Fred Dixon
4d5fa78398
Added definition for NCPU 2019-03-09 19:11:30 -05:00
Fred Dixon
8e2d32f3e0 Added link to home page from bbb-conf --check 2019-03-09 17:58:53 -06:00
Fred Dixon
f1d5d6d812 Make bbb-conf executable 2019-03-09 15:15:17 -06:00
Fred Dixon
cc1af4f696 Fixes #2930 2019-03-09 10:52:51 -06:00
Fred Dixon
e9d00bf972 fix scanning for server_name 2019-03-08 16:39:30 -06:00
Fred Dixon
c00c1df55f Warn if ASK_MODERATOR is set in bigbluebutton.properties 2019-03-07 11:59:14 -06:00
Fred Dixon
422066cf9d Moved helper functions for local configuration to apply-lib.sh 2019-03-07 11:50:54 -06:00
Fred Dixon
080cacba46 Don't try to clean tomcat7 logs if they don't exist 2019-03-07 11:48:23 -06:00
Fred Dixon
c33245c811
Fix logic error in bbb-conf --check 2019-03-04 12:06:53 -05:00
Fred Dixon
78ee39f606 Increase timeout for waiting for bbb-web to startup 2019-03-04 08:57:26 -06:00
Fred Dixon
09362e30ad
Bumped to 2.2.0-beta 2019-02-23 09:56:00 -05:00
Fred Dixon
1f5de941e2
Bumped to 2.2.0-beta 2019-02-23 09:55:29 -05:00
Fred Dixon
6fe5439ae8 Ensure default.yml is owned by bigbluebutton 2019-02-12 22:18:42 -06:00
Fred Dixon
915393ba1a Properly assign kurento[0].url in default.yaml 2019-02-12 01:58:47 -06:00
Fred Dixon
6f7ffdf83d
Increase timeout for waiting for bbb-web to startup 2019-02-10 23:03:18 -08:00
Fred Dixon
d2119bd29e Clear previous SIP errors in sip.log 2019-02-11 00:23:10 -06:00
Fred Dixon
2e86350807 Restored declaration for PROTOCOL_RTMP 2019-02-10 22:40:36 -06:00
Fred Dixon
96911bc2de Use lowercase for http/https 2019-02-10 21:34:43 -06:00
Fred Dixon
760e9355e2 First implementation of a script to apply local changes between restats 2019-02-10 11:48:50 -06:00
Fred Dixon
fa42627441 Refactored bbb-conf to better read data from configuration files. Removed some old code. 2019-02-10 11:48:17 -06:00
Ghazi Triki
85bb9b4184 Fix triplicated bbb-web service in bbb-conf 2019-02-08 18:45:39 +01:00
Ghazi Triki
99aa2b5fcc Use the right bigbluebutton user for recording directories. 2019-02-08 17:53:57 +01:00
Fred Dixon
e7bc3aedae
Properly update API demos with 2019-02-07 18:39:41 -07:00
Fred Dixon
f4a0fbdc4e Added support to start/stop bbb-web 2019-02-07 19:23:00 -06:00
Fred Dixon
e2d593dbd5 Updated bbb-conf for new bbb-web 2019-02-07 17:10:55 -06:00
Fred Dixon
585126b25d Add check for restarting etherpad 2019-01-25 11:47:41 -06:00
Fred Dixon
566b245e3c
Merge pull request #6385 from pedrobmarin/keep-meeting-events
Created property keepEvents at bbb-web to make redis record the event…
2019-01-24 21:47:50 -05:00
Fred Dixon
0484a4c604
Update index.html to join HTML5 user as Moderator 2019-01-23 16:46:31 -05:00
Fred Dixon
a3fda63b49 Updated index page for 2.2-dev 2019-01-18 10:19:26 -06:00
Fred Dixon
84c383be3a Added restart for Etherpad 2019-01-17 17:49:04 -06:00
Fred Dixon
e6e1a91173 Added more checks for FreeSWITCH 2019-01-16 14:22:10 -06:00
Fred Dixon
7c2f2d5592 Moved apply-config.sh to before restart 2019-01-10 16:48:53 -06:00
Fred Dixon
b29800f438
Format message for applying local changes 2019-01-09 19:20:02 -05:00
Fred Dixon
7cc318d68b Use /etc/bigbluebutton/bbb-conf/apply-config.sh for applying local config options 2019-01-09 18:13:21 -06:00
Fred Dixon
b8b0f24e88
Update check for ffmpeg 4.1 2019-01-03 15:07:46 -04:00
Fred Dixon
dfdef828ec
Use yq to pull from bbb-webrtc-sfu default.yml 2018-12-27 23:12:27 -04:00
Ghazi Triki
e0bfdb525b Longer arrow for long service name. 2018-12-12 16:58:32 +01:00
Ghazi Triki
b6c924215b Better display of BigBlueButton services. 2018-12-12 16:56:02 +01:00
Pedro Beschorner Marin
ebffcb0848 Created property keepEvents at bbb-web to make redis record the events for all meetings 2018-12-11 18:37:31 -02:00
Fred Dixon
75df6406c1
Minor change to test build 2018-12-11 08:15:04 -05:00
Ghazi Triki
b62c822d67 Better logs cleanup. 2018-12-09 21:47:13 +01:00
Fred Dixon
06d6928403 Fix use of SUDO variable 2018-12-08 18:23:20 -06:00
Mikhail Novosyolov
c2faf55d6e Dynamically detect is sudo is needed
Fixes #6281
2018-11-22 21:13:46 +03:00
Richard Alam
6dcb310a66 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov16 2018-11-16 13:29:36 -08:00
Fred Dixon
4db70857c3
Update bigbluebutton-release 2018-11-14 22:19:48 -05:00
Fred Dixon
d067fc8ee4 Fix executable of bbb-conf 2018-10-22 15:40:34 -05:00
Fred Dixon
1ca0a251f4 Update wsUrl for settings.yml 2018-10-22 15:27:46 -05:00
Fred Dixon
b99101fa88
Update bigbluebutton-release 2018-10-15 08:28:16 -04:00
Fred Dixon
5cb222c7de
Update bigbluebutton-release 2018-09-13 16:48:04 -04:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Fred Dixon
2483d4ffc1 Check that HTML5_CONFIG file exists before scanning it 2018-09-03 08:51:52 -05:00
Ghazi Triki
b3be2d7410 Fix chromeExtensionLink restore in bbb-conf. 2018-08-30 16:18:41 +01:00
Fred Dixon
7163bbf3ca
Ensure recordings in Kurento are cleaned up 2018-08-29 06:38:50 -04:00
Fred Dixon
a7a459ae06
Update bigbluebutton-release 2018-08-28 15:47:52 -04:00
Anton Georgiev
6159fa1ed9 add warning if kurento listenOnly but no FS :5066 2018-08-24 19:02:51 +00:00
Anton Georgiev
96489c30a8
Update bigbluebutton-release to 2.0.0-RC4 2018-08-17 11:33:42 -04:00
Fred Dixon
1d783b9372
Update bigbluebutton-release 2018-07-31 17:16:52 -04:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00:00
Ghazi Triki
853f30a80e Clean bbb-conf from unused variables. 2018-07-24 10:35:48 +01:00
Ghazi Triki
66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
2018-07-16 16:08:38 +01:00
Harald Kastner
f982efa823
Update bbb-conf due to chromeExtensionLinkURL
chromeExtensionLinkURL gets crippled in config.xml thus Google Chrome server sharing extension fails to install through crippled link.
2018-07-15 16:15:50 +02:00
Fred Dixon
73db36bc9d Added blank pages for whiteboard 2018-07-07 17:30:19 -04:00
Fred Dixon
f79e0a3680 Bumped version to 2.0-RC2 2018-07-07 17:10:31 -04:00
Fred Dixon
cc15ea460e Updated default presentation. Fixes #5774 2018-07-07 17:08:28 -04:00
Fred Dixon
936d57e233
Update index_html5_vs_flash.html
Fixed typo
2018-07-06 08:57:24 -04:00
Anton Georgiev
eca2e50e1a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current 2018-07-03 20:17:42 +00:00
Fred Dixon
da97ac14a5 Only use chromeExtensionLinkURL if it is set 2018-06-29 15:32:43 -05: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
29eee15cf0
Merge pull request #5775 from kepstin/log-cleanup
Improve bigbluebutton cleanup cron job
2018-06-29 15:56:50 -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
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
5bb98daa90 Add additional step to installing PPA for ffmpeg 2018-06-27 15:44:13 -05:00
Anton Georgiev
80fbebe829
Fix typo in clearing bbb-webrtc-sfu logs 2018-06-25 11:34:29 -04:00
Fred Dixon
baa2c5bd59 Fix #5725 2018-06-24 17:45:30 -05:00
Fred Dixon
d4cd5ae0c4 Bump version to RC1 2018-06-24 17:37:47 -05:00
Fred Dixon
95919448e3 Fixed typo 2018-06-24 14:56:09 -05:00
Fred Dixon
9eb3da4970 Improve checking of webhooks and ffmpeg 2018-06-24 14:27:57 -05:00
Fred Dixon
5a671d4d3d
Update bbb-conf 2018-06-23 08:58:37 -04:00
Fred Dixon
f934e98369 One more step for upgrade ffmpeg 2018-06-22 15:34:28 -05:00
Fred Dixon
47fefd5cbd
Bump the version number 2018-06-22 15:13:14 -04:00
Fred Dixon
29e0a62533 Add check for ffmpeg 2018-06-22 13:58:30 -05: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
Fred Dixon
01b11ccebe Added check for version of node and mongod 2018-06-16 15:29:56 -05:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
Fred Dixon
dd605f4e2e
Fix label in output for bbb-conf --check 2018-05-13 19:42:33 -04:00
Fred Dixon
313ee3c7e8 Added query of information from kurento to bbb-conf --check 2018-05-13 07:18:07 -05:00
Fred Dixon
9e6b279eb1 Fix for #5444 2018-05-10 18:54:30 -05:00
Fred Dixon
4f12774c08 Fix update of URL for thumbnails with bbb-conf --setip 2018-05-05 10:13:38 -05:00
Fred Dixon
49484bcb21 Fix for #5211 2018-04-29 21:01:01 -04:00
Fred Dixon
f004cf7398 Fix kurentoUrl so it has ws 2018-04-25 18:22:14 -05:00
Fred Dixon
4d8659aec0 Detect if any processes are not running 2018-04-09 15:57:25 -05:00
Fred Dixon
862f45e3a0 Update restart of kurento 2018-04-07 09:00:40 -04:00
Fred Dixon
ce658d89aa Fixed check to see if bbb-webhooks is installed 2018-03-21 18:23:19 -05:00
Fred Dixon
db4402e20d Added detection for pNpN interface 2018-03-21 13:59:48 -05:00
Fred Dixon
6c4870b54c Fixed #3956 2018-03-20 18:56:39 -05:00
Fred Dixon
4582a8dfa1 Fix output of value for websocket in bbb-conf 2018-03-01 05:21:09 -06:00
Fred Dixon
6a237f86dd Fixed error restarting bbb-transcode-akka 2018-02-11 12:15:19 -06:00
Fred Dixon
dea8addc9b Updates to bbb-conf to support HTML5 2018-02-08 11:26:31 -06:00
Anton Georgiev
710cca2d8e
Revert "Give mongod a moment to startup before bbb-html5" 2018-02-07 16:57:48 -05:00
Fred Dixon
11866c336e Give mongod a moment to startup before bbb-html5 2018-02-06 19:05:07 -06:00
Fred Dixon
4b0e804dd6 Fix updating of config.xml 2018-02-06 16:34:23 -06:00
Fred Dixon
a8a98e9974 Remove duplicate update for links in config.xml 2018-02-03 11:09:31 -05:00
Fred Dixon
c7782aa0a1 Update copyright to 2018 2018-02-03 10:39:25 -05:00
Fred Dixon
2380a3db2c Perserve value for chromeExtensionLink 2018-02-03 10:39:12 -05:00
Richard Alam
b91f2abde5 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-02-01 12:50:43 -08:00
Fred Dixon
c0f0303051
Merge pull request #4027 from hakaz/patch-1
Issue #3985: bbb-conf --debug incorrectly flags
2018-01-31 20:08:08 -05:00
Fred Dixon
1a6b5b1aac Fix bbb-conf to correctly use rtmp[s] with porttest 2018-01-31 16:36:48 -06:00
Richard Alam
962b520d6a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-29 12:53:20 -08:00
Fred Dixon
fe8ec692a2 Merge remote-tracking branch 'upstream/v2.0.x-release' into v2.0.x-release 2018-01-28 12:15:07 -05:00
Fred Dixon
e6156d90f7 Update settings-production.json when assigning hostname 2018-01-15 11:31:36 -06:00
Fred Dixon
cb9de5a38c Update settings-production.json when assigning hostname 2018-01-15 11:11:05 -06:00
Anton Georgiev
696974d3b7
Update index_html5_vs_flash.html 2017-12-14 10:58:06 -05:00
Anton Georgiev
6d6cf78003
Update index_html5_vs_flash.html 2017-11-22 12:06:27 -05:00
Richard Alam
d61129927e Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-11-14 13:55:18 -08:00
Anton Georgiev
8f1dfe55f5 switch version to 2.0-beta 2017-11-01 16:02:14 -04:00
Anton Georgiev
05a31d53c1 add portal with html5 AND Flash entry point 2017-11-01 15:50:33 -04:00
Richard Alam
72a1745c65 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-10-31 14:58:36 -07:00
Fred Dixon
936b299f68 Removed old reference to libreoffice systemd script 2017-10-28 09:56:20 -04:00
Fred Dixon
2aa45aeeee Implemented #4447 2017-10-28 09:54:19 -04:00
Fred Dixon
1f43daeab0 Remove old reference to libreoffice.service 2017-10-28 09:48:20 -04:00
Leonardo Crauss Daronco
9d95e70651 Adjust indentation on bbb-record 2017-10-10 09:06:21 -03:00
Leonardo Crauss Daronco
af87bc2d3f Merge remote-tracking branch 'upstream/master' into v1.1.0-rap-on-resque 2017-10-09 16:37:28 -03:00
Richard Alam
5628ee9004 Merge pull request #4448 from ritzalam/implement-multi-chat
Development for the next release
2017-10-03 13:41:02 -04:00
Fred Dixon
798520daa9 Update bigbluebutton-release 2017-10-02 13:45:26 -04:00
Fred Dixon
67aec4e814 Testing builds after the switch to v2.0.x-release 2017-09-29 13:10:05 -04:00
Fred Dixon
ead8f766e7 Fixed spelling mistake 2017-09-25 22:25:19 -04:00
Fred Dixon
4a9b6ec8fd Merge pull request #4379 from ritzalam/fix-xss
fix passive xss
2017-09-12 13:01:09 -04:00
Fred Dixon
daf67c2f00 Update bigbluebutton-release 2017-09-11 21:03:19 -04:00
Richard Alam
9e906bd671 - fix passive xss 2017-09-11 14:38:09 -07:00
Fred Dixon
97148ac99b Added home.html to redirect to bigbluebutton.org when user clicks lower left text 2017-08-21 12:58:58 -05:00
Fred Dixon
85ced4b153 Minor updates for CentOS (nc does not have -z option on CentOS 7.3) 2017-08-17 10:55:05 -05:00
Fred Dixon
1af38493e4 Minor updates for detecting CentOS installation 2017-08-15 17:57:40 -05:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07:00
Matthew Marangoni
4b8704ad08 Merge remote-tracking branch 'upstream/master' into call-manager 2017-07-25 08:44:45 -07:00
Fred Dixon
ff365120cc Update index.html
Bump version to 2.0-dev
2017-07-25 07:23:26 -06:00
Srikar Kashyap Pulipaka
09b16f2e61 grammatical error 2017-07-23 11:41:49 +05:30
Richard Alam
810a027907 Merge branch '2x-transcode-screenshare-merge' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-2x-transcode-screenshare-merge 2017-07-17 18:49:58 -07:00
Leonardo Crauss Daronco
8e69d2217a Update bbb-{conf,record} to work with rap on resque 2017-07-14 17:38:32 -03:00
Fred Dixon
b106302aa3 Updated screenshareRtmpServer in screenshareRtmpServer 2017-07-14 09:45:21 -05:00
Fred Dixon
11f6945905 Updated screenshareRtmpServer in screenshareRtmpServer 2017-07-14 09:43:34 -05:00
Fred Dixon
9104d440f7 Update screenshareConfSuffix when doing bbb-conf --setip 2017-07-14 09:33:30 -05:00
Fred Dixon
17212d93ff Update bigbluebutton-release 2017-07-14 10:14:06 -04:00
Pedro Beschorner Marin
2097b611ed Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
2017-07-11 20:41:38 +00:00
Harald Kastner
1672bc7b73 Issue #3985: bbb-conf --debug incorrectly flags
Tracked the error down to bbb-record line 718 ff. which is called by bbb-conf --debug and misses support for "https". Added support for "https" and incorrect flagging vanishes.
2017-06-22 10:53:10 +02:00
Klaus
0c596c304d Merge remote-tracking branch 'upstream/bbb-2x-mconf' into SplitRedis 2017-06-20 14:16:16 -03:00
Pedro Beschorner Marin
15c6420e97 Merge tag 'v1.1.0' into 1.1-transcode
tagging v1.1.0 release

 Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bbb-web-api/src/main/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
2017-06-13 17:44:12 +00:00
Pedro Beschorner Marin
555c7e351f Merge remote-tracking branch 'mconf-akka-transcoding' into merging-into-bbb-1.1
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/H263Converter.java
	bigbluebutton-config/bin/bbb-conf
2017-06-07 18:18:54 -03:00
Fred Dixon
66aa72e1e7 Improved the detection if IP addresses in bbb-conf 2017-05-23 10:29:16 -05:00
Ghazi Triki
7d283cd154 Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x
# Conflicts:
#	bigbluebutton-client/resources/config.xml.template
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
#	record-and-playback/core/scripts/rap-process-worker.rb
2017-05-22 17:35:24 +01:00
Fred Dixon
eabfd7e862 Bump version number to 1.1.0 2017-05-22 10:23:55 -05:00
Mario Gasparoni
89e6aaba35 Add bbb-transcode-akka to bigbluebutton-config 2017-05-18 14:19:24 +00:00
Richard Alam
69cc522473 Merge branch 'bbb-2.x-dev-mconf' into bbb-2x-mconf 2017-05-04 15:57:42 -07:00
Richard Alam
23e6dea35b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf 2017-05-04 14:39:02 -07:00
Fred Dixon
f0728393ac Update bbb-conf 2017-05-04 17:34:12 -04:00
Fred Dixon
b061996e44 Update bbb-conf
test-commit
2017-05-04 17:31:58 -04:00
Fred Dixon
401f46c5c6 Update bbb-conf 2017-05-04 16:41:35 -04:00
Fred Dixon
ef8fdccd4f Updated comment in crontab job 2017-05-04 05:04:25 -04:00
Fred Dixon
b26ac2b6bc Remove refs to ghostscript 2017-05-04 03:57:43 -05:00
Pedro Beschorner Marin
66a12c9c7a Moving the meeting life cycle management from bbb-web to akka-apps 2017-05-03 17:02:16 +00:00
Richard Alam
c733f4eafc Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf 2017-04-27 14:52:47 -07:00
Fred Dixon
6daedbfc7b Update version to 1.1-RC 2017-04-27 10:45:49 -05:00
Fred Dixon
766b78df74 Improved detection for IP address on new ethernet card names 2017-04-26 17:17:30 -05:00
Richard Alam
262c7250c8 Merge branch 'master' with bbb-mconf 2017-04-17 15:57:31 +00:00
Fred Dixon
52a74d0063 Fixed output of free memory + minor code cleanup 2017-04-08 17:41:20 -05:00
Richard Alam
c73739636a Merge branch 'merging-into-bbb-1.1' of https://github.com/mconf/bigbluebutton into merge-mconf 2017-04-06 17:01:58 +00:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Fred Dixon
c22d44530a Fixed https://github.com/bigbluebutton/bigbluebutton/issues/3777 2017-04-04 09:05:19 -05:00
Pedro Beschorner Marin
84fd8d4101 Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images! 2017-04-03 17:06:16 +00:00
Pedro Beschorner Marin
aa8e5045f7 Removed old FreeSWITCH paths that we added in the beggining of version 1.6 testing 2017-03-31 13:57:22 +00:00
Fred Dixon
cf1a6782ca Updated bbb-conf --restart to restart bbb-webhooks 2017-03-28 12:42:06 -05:00
Fred Dixon
a4457e6d7d Updated references to systemd units for recording 2017-03-28 12:30:07 -05:00
Calvin Walton
1fe52cc24f bbb-conf: Stop all of the new recording units 2017-03-24 15:17:29 -04:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Fred Dixon
20f8b4c22d Updated IP detection in bbb-conf 2017-03-13 18:47:48 -05:00
Felipe Cecagno
91f4fd8478 disallow crawlers 2017-03-12 21:46:18 -03:00
Fred Dixon
2281ca083a removed 'capture video' from bbb-conf --check 2017-03-08 12:39:12 -06:00
Fred Dixon
c28c78a405 Minor updates for release -- bumped the API version 2017-03-06 13:57:54 -06:00
Fred Dixon
18e1f3539a Updated cron.daily to remove *.meta files from /usr/share/red5/webapps/video/streams 2017-03-04 20:30:11 -06:00
Fred Dixon
2f528b5d74 Fixed reference to lti.properties 2017-03-02 15:17:40 -06:00
Fred Dixon
e5264d8556 Updated with correct version 2017-02-20 13:11:22 -06:00
Fred Dixon
4cd8959c79 Check for initial values in application.conf 2017-02-20 13:07:20 -06:00
Fred Dixon
0589105b37 bbb-conf --check warns you if you have SSL configured by still have FreeSWITCH listening on port 5066 2017-01-28 18:58:46 -06:00
Fred Dixon
a7a16a7d4c Cleanup formatting of port for nginx in bbb-conf --check 2017-01-28 17:46:02 -06:00
Fred Dixon
1ff622da06 Update index.html
Bumped the copyright date on index.html
2017-01-05 10:01:41 -05:00
Fred Dixon
54f2ec9b9d Updated landingage page for 1.1-beta 2016-12-16 10:14:24 -06:00
Fred Dixon
5a8e936a8e Refactored the checks in bbb-conf detecting proper startup 2016-12-09 11:22:07 -06:00