BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,679 Commits 13 Branches 260 Tags 1.1 GiB
1639978d17
Commit Graph

702 Commits

Author SHA1 Message Date
Fred Dixon
17c5ea9aed Fixup bbb-conf for 2.3-alpha3 2020-12-18 16:41:08 -06:00
Anton Georgiev
998eea6ec4
Changed a few more http links to https 2020-12-18 10:53:51 -05:00
Dennis1993
ef4e871638
Update URL to HTTPS 
Change http:// to https://
 2020-12-18 16:45:18 +01:00
Anton Georgiev
c1ffced27d Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into develop 2020-12-17 21:14:29 +00:00
Fred Dixon
1105e85456 Removed extra fi 2020-12-12 15:49:26 -06:00
Fred Dixon
c99834f187 Echo STUN server if enabled 2020-12-12 15:35:14 -06:00
Fred Dixon
3424c5b7c9
Merge pull request #10900 from wmchris/develop 
The first element of "hostname -I" is not intended to receive the primary IP address in bbb-conf
 2020-12-10 20:51:17 -04:00
Anton Georgiev
244a239810 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 2020-12-01-merge 2020-12-01 20:02:50 +00:00
Fred Dixon
4dc33a2ac6 Mask output of which command 2020-11-27 15:40:44 -06:00
Christian Uhl
ded1b3e7b2 fixed indentation 2020-11-25 14:20:25 +01:00
Christian Uhl
af55f21284 The first element of "hostname -I" is not intended to receive the primary IP address in bbb-conf 2020-11-25 14:18:33 +01:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
Fred Dixon
e37e1aa55a Don't warn about sip.js if sipjsHackViaWs=true 2020-11-23 19:52:21 -06:00
Fred Dixon
0a4726bfcf Added check for default stun.freeswitch.org 2020-11-23 07:11:06 -06: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
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
8c21eca5dd properly update ESL password 2020-09-14 16:19:46 -05:00
Fred Dixon
65d7e6c954 Remove bbb-transcode-akka from monitoring 2020-08-27 17:13:15 -05: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
Ghazi Triki
b4c80b8572 Collect more bigbluebutton nginx access logs in bbb-conf --zip 2020-07-15 09:31:45 +01: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
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
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
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
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
znerol
858361b10e Support underscore in nginx server_name 2020-05-17 17:34:20 +02:00
Fred Dixon
b257e34d9d Check for kurento.sip_ip is correct 2020-05-16 08:45:27 -05:00
Fred Dixon
6af3a41c5d
Update bbb-conf 
Added display of kurento.sip_ip
 2020-05-13 08:39:32 -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
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
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
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
Fred Dixon
0762f04fd7 Fix broken link 2020-02-24 12:34:05 -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
98a1b9115e Added start/stop for bbb-rap-caption-inbox.service 2020-01-27 18:37:04 -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
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
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
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
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
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
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
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
Fred Dixon
44b5f80600 Don't update kurento[0].url 2019-08-21 12:12:41 -05: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
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
Ghazi Triki
3585998c40 Update all recording types link tags. 2019-07-11 13:47:30 +03: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
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
ec6306019d Added checks for LANG=en_US.UTF-8 and permissions on /var/bigbluebutton 2019-06-20 20:21:25 -05:00
Fred Dixon
09c43d8818 Don't print warning if tomcat7 is not installed 2019-06-02 21:20:07 -05:00
Felipe Cecagno
d1bc69ba68 fix permissions of bigbluebutton-config utilities 2019-05-21 14:33:46 -03:00
Ghazi Triki
7204b069e5 Display etherpad service status. 2019-05-16 22:05:16 +01:00
Fred Dixon
22af07df15
Update bbb-conf 2019-05-14 18:57:45 -04: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
f600f397f1
Improve generation of new shared secret 2019-04-14 10:46:20 -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
Anton Georgiev
784dd76526
Typo in bbb-conf 2019-04-08 16:52:28 -04:00
Ghazi Triki
a8c01fe122 Fix clean logs and improve cleaning FreeSwitch logs. 2019-03-26 18:02:38 +01: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
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
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
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
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
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
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
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
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
Anton Georgiev
6159fa1ed9 add warning if kurento listenOnly but no FS :5066 2018-08-24 19:02:51 +00:00
Ghazi Triki
853f30a80e Clean bbb-conf from unused variables. 2018-07-24 10:35:48 +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
da97ac14a5 Only use chromeExtensionLinkURL if it is set 2018-06-29 15:32:43 -05: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
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
29e0a62533 Add check for ffmpeg 2018-06-22 13:58:30 -05:00
Fred Dixon
01b11ccebe Added check for version of node and mongod 2018-06-16 15:29:56 -05: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
a8a98e9974 Remove duplicate update for links in config.xml 2018-02-03 11:09:31 -05:00
Fred Dixon
2380a3db2c Perserve value for chromeExtensionLink 2018-02-03 10:39:12 -05:00
Fred Dixon
1a6b5b1aac Fix bbb-conf to correctly use rtmp[s] with porttest 2018-01-31 16:36:48 -06: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
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
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
Fred Dixon
ead8f766e7 Fixed spelling mistake 2017-09-25 22:25:19 -04: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
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
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
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
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
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
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