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
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
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
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
Anton Georgiev
696974d3b7
Update index_html5_vs_flash.html
2017-12-14 10:58:06 -05: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
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
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
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
