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
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
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
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
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
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
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
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
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
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
5a8e936a8e
Refactored the checks in bbb-conf detecting proper startup
2016-12-09 11:22:07 -06:00
Felipe Cecagno
a4ea315c39
improve logic to stop services on bbb-conf; stop also bbb-webhooks and libreoffice
2016-12-09 13:37:26 +00:00
Fred Dixon
34fa8fb310
Updated bbb-conf for detecting when FreeSWITCH is not responding to event socket comamnds on 8021
2016-12-08 12:10:13 -06:00
Fred Dixon
ad8a12923f
Remove /tmp/tmp.XXXXXXXX file created by bbb-record
2016-11-04 12:05:41 -05:00
Fred Dixon
48b5cf89fe
Fixed stream to streams
2016-11-04 11:09:34 -05:00
Fred Dixon
d4828f27ad
Merge pull request #3413 from riadvice/bbb-conf-redis-and-recordings
...
Update to bbb-conf for --check, --stop and --start
2016-10-30 20:13:31 -07:00
Richard Alam
2facff623a
Merge pull request #3411 from riadvice/unique-meeting-id-breakout-rooms
...
Unique meeting id for breakout rooms & additional improvements
2016-10-21 15:11:28 -04:00
Ghazi Triki
1c78eb1af5
Format line in bbb-conf using spaces.
2016-10-17 11:18:34 +01:00
Ghazi Triki
a477fc2442
bbb-conf stops and starts redis server & checks video and freeswitch recordings directories
2016-10-17 11:12:34 +01:00
Ghazi Triki
265216a33c
Updated bbb-record rules to detect recording directories.
2016-10-17 09:08:29 +01:00
Fred Dixon
06c879db37
fix sed for bbb-conf --check
2016-10-09 21:13:30 -05:00
Fred Dixon
20f47f5245
Merge pull request #3393 from riadvice/bbb-record-delete-breakout-rooms-directories
...
Better recording directories detection rule including breakout rooms in bbb-record
2016-09-30 17:18:22 -04:00
Ghazi Triki
e6671f47d7
Made grep expression in bbb-record more strict to only detect recordings directories including breakout rooms ones.
2016-09-27 11:46:38 +01:00
Fred Dixon
3f4014fe54
Added check for restarting HTML5 server component
2016-09-20 11:16:01 -04:00
Calvin Walton
5600ddfba4
Update bbb-record to use systemctl to print process status
2016-09-12 17:26:40 -04:00
Pedro Beschorner Marin
bd82a036a3
Fixed API Mate URL
2016-09-09 19:28:24 +00:00
Pedro Beschorner Marin
66e318cd91
Adjusting configurations to fit FreeSWITCH 1.6.X changes
2016-08-31 19:35:07 +00:00
Ghazi Triki
f04798405a
Archive more logs with zip option and show more applications with status using "bbb-conf"
2016-08-15 11:41:02 +01:00
Calvin Walton
9e8015512b
Update bbb-conf for new systemd bbb-record-core jobs
2016-08-02 17:27:33 -04:00
Fred Dixon
8dd4810f29
Updated checks in bbb-conf for https
2016-07-27 16:39:31 -04:00
Fred Dixon
4a446146e1
bbb-conf updates bbb-apps-screenshare and bbb-apps-akka with https URLs
2016-07-25 12:51:37 -04:00
Fred Dixon
ecc1623a54
Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
2016-07-02 17:57:49 -04:00
Anton Georgiev
228dfb4061
Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/resources/application.conf
akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-fsesl/build.sbt
bbb-common-message/build.sbt
bbb-fsesl-client/build.sbt
bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
bigbluebutton-apps/build.gradle
bigbluebutton-client/build.xml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-html5/app/client/NotificationControl.coffee
bigbluebutton-html5/app/client/globals.coffee
bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
bigbluebutton-html5/app/client/main.coffee
bigbluebutton-html5/app/client/main.html
bigbluebutton-html5/app/client/stylesheets/whiteboard.less
bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
bigbluebutton-html5/app/client/views/modals/settings.coffee
bigbluebutton-html5/app/client/views/modals/settings.html
bigbluebutton-html5/app/client/views/users/user_item.coffee
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
bigbluebutton-html5/app/collections/collections.coffee
bigbluebutton-html5/app/config.coffee
bigbluebutton-html5/app/lib/router.coffee
bigbluebutton-html5/app/server/collection_methods/meetings.coffee
bigbluebutton-html5/app/server/collection_methods/users.coffee
bigbluebutton-html5/app/server/publish.coffee
bigbluebutton-html5/app/server/server.coffee
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
record-and-playback/presentation/scripts/process/presentation.rb
record-and-playback/presentation/scripts/publish/presentation.rb
2016-05-18 15:14:04 +00:00
Felipe Cecagno
e4da408c08
Merge branch 'mconf' into bigbluebutton/bigbluebutton@master
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
record-and-playback/presentation/playback/presentation/0.9.0/playback.html
record-and-playback/presentation/scripts/publish/presentation.rb
2016-03-02 01:19:09 -03:00
Fred Dixon
1f7023cd06
Fixed on bug in matching for http/https
2016-02-28 18:58:25 -05:00
Fred Dixon
539d70a993
Updates to bbb-conf to support HTTPS configuration
2016-02-28 18:30:09 -05:00
jfederico
0d017dc265
bigbluebutton-config: Included the new directory [deleted] in shell for managing recordings
2016-02-16 15:14:46 -05:00
Felipe Cecagno
2a3b95daf7
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-config/bin/bbb-conf
2016-01-26 18:33:31 -02:00
Fred Dixon
28e34b041e
Added more checks in bbb-conf --check
2016-01-17 16:58:29 -05:00
Fred Dixon
58c2dbdaf9
Fix syntax error in bbb-conf
2016-01-15 14:38:02 -05:00
Fred Dixon
7fae413641
Made bbb-conf --enablewebrtc aware of SSL configuration
2016-01-15 14:18:23 -05:00
Fred Dixon
f7294d30d3
Added check for displaying 443 ssl port when doing bbb-conf --check
2016-01-14 18:51:38 -05:00
Fred Dixon
a0e0fc1520
Fix for #2930
2016-01-10 16:32:41 -05:00
Anton Georgiev
7bf1d4ce8c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3
...
Conflicts:
record-and-playback/core/scripts/bigbluebutton.yml
2015-11-30 21:44:04 +00:00
Pedro Beschorner Marin
36bbcc06d6
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge
...
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-video/.classpath
bbb-video/build.gradle
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bbb-video/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_LA/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/SharedNotesModule.mxml
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeMyRole.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
bigbluebutton-config/bigbluebutton-release
bigbluebutton-config/bin/bbb-conf
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
2015-11-25 15:58:36 +00:00
Fred Dixon
19c487a5f0
Fixed #2835
2015-10-23 17:46:27 -04:00
Anton Georgiev
8e407df405
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-fsesl/build.sbt
bbb-common-message/build.sbt
bigbluebutton-apps/build.gradle
2015-10-22 20:46:30 +00:00
Anton Georgiev
0d74742da4
video-broadcast delete files after N days
2015-09-30 19:51:40 +00:00
Fred Dixon
536cf68bd6
bump from 1.0.0-dev to 1.0.0-beta
2015-09-23 18:00:16 -04:00
Fred Dixon
ddc473105d
Update bbb-conf
...
Remove reference to rtmps
2015-09-22 14:51:23 -04:00
Fred Dixon
3a309f9119
Fixed error in parsing config.xml in bbb-conf
2015-09-12 19:48:15 -03:00
Fred Dixon
13db512b9d
Updated bbb-conf to update URLS for http/https and rtmp/rtmps
2015-09-12 19:39:11 -03:00
Felipe Cecagno
fa35cc7e49
update bbb-conf in order to enable and disable the secure websocket interface on freeswitch when using --enablewebrtc and --disablewebrtc
2015-09-12 14:14:01 -03:00
Fred Dixon
49ece78679
bbb-conf --clean also cleans log files for bbb-apps-akka and bbb-fsesl-akka
2015-08-22 23:29:13 -04:00
Fred Dixon
ec2cd0567b
Added check to ensure PID for red5 matches that in /var/run/red5.pid
2015-08-22 20:46:18 -04:00
Fred Dixon
660f1aaecd
Fixed error in parsing config.xml in bbb-conf
2015-08-21 16:55:16 -04:00
Fred Dixon
a38e278e2b
Added check in bbb-conf for version of LibreOffice
2015-08-10 17:39:01 -04:00
Fred Dixon
02dc138689
Updated bbb-conf to update URLS for http/https and rtmp/rtmps
2015-08-08 23:26:09 -04:00
Fred Dixon
b23a6df190
Updated bbb-conf to assign hostname to publishURI parameter in config.xml
2015-08-07 15:56:35 -04:00
Fred Dixon
ae1efb02f1
Added support for bbb-apps-akka and bbb-fsesl-akka in bbb-conf start/stop/restart
2015-07-02 17:15:26 -04:00
Felipe Cecagno
43ec219a51
Merge branch 'bbb-conf-api-mate' into mconf-live0.6.3
2015-05-26 21:55:41 -03:00
Felipe Cecagno
13d7809a8d
added a link to the api mate when type bbb-conf --salt
2015-05-26 21:55:26 -03:00
Felipe Cecagno
e8717d3fb2
Merge branch 'promote-webhooks' into mconf-live0.6.3
2015-05-18 13:00:52 -03:00
Felipe Cecagno
7cb12f8b49
Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release
...
Conflicts:
bbb-api-demo/src/main/webapp/demo10_helper.jsp
bbb-video/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/locale/bg_BG/bbbResources.properties
bigbluebutton-client/locale/cs_CZ/bbbResources.properties
bigbluebutton-client/locale/cy_GB/bbbResources.properties
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_419/bbbResources.properties
bigbluebutton-client/locale/es_ES/bbbResources.properties
bigbluebutton-client/locale/et_EE/bbbResources.properties
bigbluebutton-client/locale/fa_IR/bbbResources.properties
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/locale/fr_FR/bbbResources.properties
bigbluebutton-client/locale/hu_HU/bbbResources.properties
bigbluebutton-client/locale/hy_AM/bbbResources.properties
bigbluebutton-client/locale/it_IT/bbbResources.properties
bigbluebutton-client/locale/ms_MY/bbbResources.properties
bigbluebutton-client/locale/no_NO/bbbResources.properties
bigbluebutton-client/locale/pl_PL/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/locale/sk_SK/bbbResources.properties
bigbluebutton-client/locale/tr_TR/bbbResources.properties
bigbluebutton-client/locale/uk_UA/bbbResources.properties
bigbluebutton-client/locale/zh_CN/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
bigbluebutton-client/resources/prod/lib/deployJava.js
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2015-05-17 19:25:26 -03:00
Felipe Cecagno
4051c97a9d
added some code to bbb-conf in order to check the webhooks app is well configured, and also to update the security key
2015-05-06 11:24:50 -03:00
