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
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
2fbb2f4dc7
Update bigbluebutton-release
2016-12-07 10:54:29 -02:00
Fred Dixon
9f96f6883f
Updated restart of libreoffice for systemd
2016-11-08 17:55:44 -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
Ghazi Triki
e187634c2a
Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.
2016-10-14 16:33:17 +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
Felipe Cecagno
57047b5964
fix bigbluebutton cron job
2016-09-05 12:50:41 -03: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
db4a731480
Use correct directories and service names in daily cron
...
Some of the stuff has gotten moved around in the 1.1 dev process.
2016-08-08 11:16:51 -04: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
Ubuntu
6cc9f0d92e
Merge branch 'master' of github.com:jfederico/bigbluebutton into bbb-web_fix-maxParticipants-by-tracking-joins-II
2016-07-11 14:28:25 +00: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
jfederico
a518a3a092
Reverted changes to error rendering response from join
2016-06-30 17:52:10 -04:00
jfederico
61c5571a4e
Added logic for autoclose index page when close=tru parameter is included
2016-06-30 14:59:41 -04:00
Pedro Beschorner Marin
17fc566975
Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0
...
Conflicts:
bigbluebutton-client/locale/es_LA/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
bigbluebutton-config/web/default.pdf
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2016-06-17 18:00:51 +00:00
Fred Dixon
3500aa2303
Updated releaes environment variable to 1.1.0-dev
2016-05-28 15:50:57 -04:00
Fred Dixon
bd9124d286
Bump version on index.html page to 1.1-dev
2016-05-28 13:03:26 -04:00
Richard Alam
7ae9b7b204
Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-fsesl/build.sbt
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
bbb-common-message/build.sbt
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
bigbluebutton-apps/build.gradle
bigbluebutton-web/grails-app/conf/spring/resources.xml
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-20 20:27:52 +00:00
Richard Alam
41a258dd59
Merge branch 'bbb-web_fix-maxParticipants-by-tracking-joins' of https://github.com/jfederico/bigbluebutton into jfederico-bbb-web_fix-maxParticipants-by-tracking-joins
...
Conflicts:
bigbluebutton-config/web/index.html
2016-05-20 15:28:19 +00:00
jfederico
0ce17ca9c2
bbb-config: index.html is now able to handle error messages when used as the default logoutURL
2016-05-18 16:07:13 -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
Fred Dixon
6964f69acd
Added blank pages to defaut.pdf for whiteboard
2016-05-14 09:49:50 -04:00
Fred Dixon
2a5469f269
Move from 1.0-RC to 1.0
2016-05-14 09:45:26 -04:00
Fred Dixon
7dc0871a28
Change from 1.0.0-Beta to 1.0.0-RC
2016-04-13 17:14:40 -04:00
Fred Dixon
e8243e0f9f
Fixes 332
2016-04-10 18:18:41 -04: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
Fred Dixon
4f73858521
Update index.html
...
Bump the copyright date.
2016-02-06 13:55:43 -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
a91da95072
Added check to restart libreoffice if no users are logged in
2016-01-10 18:41:30 -05:00
Fred Dixon
a0e0fc1520
Fix for #2930
2016-01-10 16:32:41 -05:00
Felipe Cecagno
8f08e13dcc
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
2015-12-30 18:35:13 -02: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
e21e4667a5
Added commands to clean out FreeSWITCH logs after a number of days
2015-11-03 18:00:23 -05: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
Fred Dixon
c9c107014d
Update index.html
2015-10-05 11:44:47 -04:00
Fred Dixon
d8cd5f7edd
Update index.html
...
Changed footer to show 1.0-beta
2015-10-05 10:55:49 -04: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
2051913359
Added Chat, Emoji, and Polling to index page
2015-09-23 17:00:26 -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
Felipe Cecagno
210cd92e50
Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.1
...
Conflicts:
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-config/web/index.html
2015-07-27 16:58:55 -03: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
Fred Dixon
c2ca2e13e3
Incremented version to 1.0.0-dev
2015-07-02 17:10:09 -04:00
Fred Dixon
e72d3e6836
Bumped from 0.9.0 to 0.9.1 to fix #1953
2015-06-24 10:58:11 -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
2a5f4ebedb
cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code
2015-05-17 23:08:41 -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
Fred Dixon
fd50f2165b
Updated footer link to new docs
2015-04-29 20:42:30 -04:00
Fred Dixon
9261791fc9
Updated footer link with new docs
2015-04-29 20:41:53 -04:00
Fred Dixon
590b846d6f
Change from 0.9.0-RC to 0.9.0
2015-04-29 19:42:04 -04:00
Fred Dixon
1b4ede0028
Update bbb-conf
2015-04-15 21:49:19 -04:00
Fred Dixon
8a27d4496c
Updating strings for 0.9.0-RC
2015-04-15 11:20:01 -04:00
Fred Dixon
ad88aa6087
Update bbb-conf
...
Removed hard-coded links to google code docs (Google Code is going away).
2015-04-14 22:12:59 -04:00
Fred Dixon
af38969cea
Update bbb-conf
...
Updated bbb-conf to properly enable/disable useWebRTCIfAvailable
2015-04-04 00:38:17 -04:00
Fred Dixon
70b5335e91
Update bbb-record
...
Fix https://code.google.com/p/bigbluebutton/issues/detail?id=1879
2015-03-23 20:08:07 -04:00
Fred Dixon
d3ec15376e
Update bbb-conf
...
Change method to detect whether HTML5 server (specifically meteor) is running.
2015-03-13 17:53:58 -04:00
Fred Dixon
52d2f69f82
Update bbb-conf
...
Properly detect if bbb-html5 is installed
2015-03-13 15:41:52 -04:00
Fred Dixon
bc736f74bc
Update bbb-conf
...
Remove hard-coded IP address (used for testing)
2015-03-12 20:16:47 -04:00
Fred Dixon
2d4b1decda
Update bbb-conf
...
Fixed spelling error
2015-03-12 19:58:34 -04:00
Fred Dixon
0fc048af0d
Update bbb-conf
...
Commented # set -x to turn off echoing of statements
2015-03-12 19:58:06 -04:00
Fred Dixon
834662aef1
Updates to bbb-conf to start/stop meteor (bbb-html5 server)
2015-03-12 19:41:26 -04:00
Calvin Walton
3fe179565e
Use cron job to delete archived files for recordings without marks
...
This way, the raw files for recordings without marks will still be deleted,
but it will be after a delay - by default, 5 days, the same as other
temporary files. This gives someone the ability to manually force the
recording to be processed by using bbb-record --rebuild
If the recording is processed by bbb-record --rebuild, it is no longer
eligible for this automatic deletion (raw files will be kept)
2015-03-11 13:40:56 -04:00
Calvin Walton
746451b999
Allow forcing 'no marks' recordings to be processed with bbb-record --rebuild
...
Some logic updates to make it more consistant with the bbb-record --delete
ordering too, to reduce races with the rap-worker.
2015-03-11 13:40:56 -04:00
Calvin Walton
aa0aaf2300
Clean up the bbb-record --republish logic
...
It's a bit simpler now, and does things in the correct order to avoid races
with the rap-worker.
2015-03-11 11:18:57 -04:00
Calvin Walton
789c55d462
Fix bbb-record --republish
...
With the new rap worker, it has to recreate the processed done file in order
to trigger the publishing step.
2015-03-11 11:01:53 -04:00
Calvin Walton
e30ccd0983
bbb-record: also delete the sanity '.fail' file on rebuild
...
This allows a rebuild to redo the sanity check if needed.
2015-01-30 10:21:09 -05:00
Felipe Cecagno
2761c31e52
Merge branch '090-encrypted-recording' into mconf-live0.6.2
...
Conflicts:
bbb-video/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
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/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/users/UsersApp.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
2015-01-21 18:11:56 -02:00
Felipe Cecagno
8e12c909c5
Merge branch '090-encrypted-recording' into HEAD
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
record-and-playback/core/Gemfile
record-and-playback/deploy.sh
2015-01-21 15:51:29 -02:00
Fred Dixon
1150572f3f
Updated copyright date on home page demo
2015-01-15 18:25:30 -05:00
Fred Dixon
eeebed20f1
added support for utf-8 characters in submit form on index.html
2014-12-14 15:53:00 -05:00
Felipe Cecagno
f188976fbc
put back the guest access in the mconf demo; reverted the index.html to not use iframe anymore
2014-12-11 09:48:38 -02:00
Felipe Cecagno
12f7aacf4b
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.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/chat/views/ChatView.mxml
2014-12-09 16:52:43 -02:00
Fred Dixon
8b2eb5e478
Merge branch 'bbb-conf-fix' of https://github.com/ffdixon/bigbluebutton into ffdixon-bbb-conf-fix
2014-11-27 14:47:43 -05:00
Fred Dixon
989fd6a122
Fixed bug that caused nested XML comments from multiple invocations of sudo bbb-conf --disablewebrtc
2014-11-27 14:38:58 -05:00
Fred Dixon
75c1f8cff3
Updated the cron.daily job for bigbluebutton to delete .pfb and .afm files generated by ghostscript from the /tmp directory.
2014-11-27 14:23:18 -05:00
Felipe Cecagno
a3acb00893
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
bbb-video/build.gradle
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
bigbluebutton-config/web/default.pdf
2014-11-22 20:28:39 -02:00
Fred Dixon
2f238d0e5e
Added support for client system check in bbb-conf
...
bbb-conf now
- prints out the host in /var/www/bigbluebutton/check/config.xml
- updates above config.xml with sudo bbb-conf --setip
2014-11-12 16:00:21 -05:00
Fred Dixon
b6ab48000b
Updates to default.pdf for 0.9.0
2014-10-25 17:37:53 -04:00
Fred Dixon
0aa299657f
Detect first if FreeSWITCH is listening in bbb-conf --check before matching with IP addresses
2014-10-25 17:37:40 -04:00
Felipe Cecagno
4b70ab8aca
copied the demo page from mconf-live0.5.2, removing the guest flag which hasn't been integrated into this branch yet
2014-10-10 19:51:10 +00:00
Felipe Cecagno
59debc5d1e
Merge branch '090-mconf-branding' into mconf-live0.6.1
2014-10-05 23:32:43 -03:00
Felipe Cecagno
015d708d7c
Merge branch 'mconf-branding-0.81' into 090-mconf-branding
...
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"
Conflicts:
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/src/BigBlueButton.mxml
record-and-playback/presentation/playback/presentation/playback.html
2014-10-05 19:36:43 -03:00
Fred Dixon
6d26b076d3
Added detection for OpenVZ IP address in bbb-conf
2014-09-17 17:37:43 -04:00
Fred Dixon
9e3c96683d
Now updates sip.nginx for enabling nginx to proxy web services calls for SIP connections from client
2014-09-14 19:42:02 -04:00
Fred Dixon
f305a9b3cb
Slightly lower memory check for 4G for servers to avoid warnings on servers with close to 4G
2014-09-14 14:09:15 -04:00
Fred Dixon
51dbe652ff
Minor change to URL for bigbluebutton.org on index.html
2014-09-14 13:56:39 -04:00
Felipe Cecagno
56f20fa5d3
Merge branch '090-encrypted-recording' into HEAD
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2014-09-10 17:27:47 -03:00
Fred Dixon
34bb061312
Change 0.9.0-dev to 0.9.0-beta on index.html
2014-09-01 20:36:20 -04:00
Fred Dixon
b00be616da
More tweaks on the language in index.html
2014-09-01 20:14:02 -04:00
Fred Dixon
7301d35941
Updates to text and tutorial videos on home page
2014-09-01 20:00:01 -04:00
Fred Dixon
93f6dcafab
Upping version from 0.9.0-dev to 0.9.0-beta
2014-09-01 17:05:33 -04:00
Felipe Cecagno
f68b0e4a16
cleanup
2014-09-01 17:53:57 -03:00
Jesus Federico
ecdcc45d9b
bbb-lti: Updated bbb-conf to fix issue with re-installations
2014-08-29 15:32:34 -04:00
Jesus Federico
d0df58cf44
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2014-08-29 09:45:52 -07:00
Jesus Federico
4ea162adff
Updated bbb-conf to support changes in bbb-lti configuration file
2014-08-29 12:44:26 -04:00
Fred Dixon
9380a73dac
Added message to let administration know that monit will restart bbb-record-core and LibreOffice. Tweaked the language for audio settings dialog.
2014-08-28 17:39:59 -04:00
Fred Dixon
855891929f
Changed warning for LibreOffice not running (monit may not have started it yet)
2014-08-23 18:43:58 -04:00
Fred Dixon
8d3a2249f5
Updated default PDF with text on each blank page
2014-08-21 21:17:51 -04:00
Fred Dixon
854e581cd5
text changes to bbb-conf and index.html
2014-08-21 20:49:23 -04:00
Fred Dixon
f704a2f3e6
Correctly stop libreoffice when doing sudo bbb-conf --clean
2014-08-20 07:08:39 -04:00
Fred Dixon
31b04303f9
Update start/stop logic for BigBlueButton to also stop monit (thanks Calvin)
2014-08-19 17:53:32 -04:00
Fred Dixon
f2efd93210
bbb-cond now ignores if redis.pass is blank in bigbluebutton.properties
2014-08-19 12:58:18 -04:00
Fred Dixon
de776dfa1b
Minor bug fix in bbb-conf
2014-08-17 22:22:26 -04:00
Fred Dixon
e898ed14c5
Better display of enablewebertc and disablewebrtc messages from bbb-conf
2014-08-17 21:33:30 -04:00
Fred Dixon
24ea43ba8f
Updates to images for webRTC audio
2014-08-17 19:36:31 -04:00
Fred Dixon
c1b325f92f
Test commit
2014-08-17 17:07:39 -04:00
Fred Dixon
5c6449ad27
Updated index.html page
2014-08-17 16:48:14 -04:00
Richard Alam
c56fde0c42
Merge pull request #348 from speakserve/unify-version-number
...
Unify version number
2014-08-13 14:17:45 -04:00
Ghazi Triki
bb09eb6d75
After checking we bumped projects version and Flex locales to 0.9.0 with some fixes
2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a
Bumped projects version and Flex locales to 0.9
2014-08-13 10:28:08 +01:00
Fred Dixon
7269e76143
Minor updates to index.html
2014-08-10 18:35:32 -04:00
Ubuntu
8ef66d8b11
Updated landing page for 0.9.0-dev
2014-08-06 23:15:53 +00:00
Fred Dixon
f0638170b3
Omit directors for bbb-conf --debug
2014-07-25 18:43:02 -04:00
Calvin Walton
6135804596
bbb-record: Improve steps done in --delete and --deleteall
...
It's now done in an order that should be less likely to cause
issues with a concurrent rap-worker process, and the files
deleted by --delete and --delete-all are now the same.
2014-07-21 14:59:44 -04:00
Calvin Walton
8b507d621e
bbb-record: Update 'rebuild' command for new rap-worker
...
The new rap worker relies only on .done files for triggering, rather
than the absence of process/publish directories.
2014-07-21 14:58:46 -04:00
Fred Dixon
2642cd0486
Added some blank pages to default presentation to use as a whiteboard
2014-06-12 17:36:50 -04:00
Fred Dixon
86f9b53e88
Fix for issue #1720
2014-05-19 21:10:07 -04:00
Fred Dixon
7b0dd94f52
Removed duplicated code
2014-05-18 22:02:21 -04:00
Fred Dixon
6f6900200b
minor fixes to bbb-conf
2014-05-01 03:03:31 +00:00
Gustavo Salazar
7d291abcfd
delete old raw dir from published recordings
2014-04-14 15:14:14 -07:00
Fred Dixon
6424af41dc
Algin calls in bbb-conf to bbb-record-core init.d script
2014-03-29 18:46:16 +00:00
Fred Dixon
45e03911ae
Better matching for webRTC enabled in config.xml
2014-03-23 22:52:39 +00:00
Fred Dixon
3a2318c491
Removed debugging information
2014-03-23 22:35:09 +00:00
Richard Alam
401ac84e49
Merge branch 'master' into merge-polling-with-master
...
Conflicts:
bigbluebutton-config/bin/bbb-conf
2014-03-19 13:59:03 +00:00
Fred Dixon
44e2255b59
reformatting of commands to enable/disable webRTC support
2014-03-16 19:55:16 +00:00
Fred Dixon
ae5316116e
Small change to test build
2014-03-15 23:33:58 +00:00
Fred Dixon
f217cbc786
updated release to 0.9.0-dev
2014-03-13 01:19:25 +00:00
Fred Dixon
7c9ed6b6ef
Merged updates to enable/disable webrtc; removed obsolete references to asterisk
2014-03-13 01:04:58 +00:00
Fred Dixon
658adc13e7
Updates to bbb-conf and bbb-record for 0.9.0
2014-03-12 01:31:56 +00:00
Gustavo Salazar
c6c5c4b81f
enable / disable webrtc
2014-03-10 14:16:37 -05:00
Fred Dixon
6e3985d202
Minor update to bbb-conf
2013-11-08 16:07:56 -05:00
Fred Dixon
b12188fbed
Changing lables for 0.81
2013-11-07 20:08:36 -05:00
Fred Dixon
149ea185f2
Updating version to 0.81-RC5
2013-10-30 14:47:16 -07:00
Richard Alam
c4855876c3
- change test java link
2013-10-21 21:50:38 +00:00
Fred Dixon
8cc76d5c61
Updating label to RC4
2013-10-20 15:46:12 -04:00
Jesus Federico
a4987f84b8
Update index.html
...
bigbluebutton-config: Fixed typo error on "Google Plus" logo
2013-10-18 15:45:10 -04:00
Fred Dixon
381ddbf3a9
Updated labels for 0.81-RC3
2013-10-09 14:05:55 -04:00
Fred Dixon
91493dc624
fixed small bug in bbb-conf --setip for LTI
2013-09-26 17:19:47 -04:00
Fred Dixon
a84c6ca8e8
Configuration updates for moving to 0.81-RC2
2013-09-26 16:42:27 -04:00
Gustavo
0390c2c3c4
bbb-record update version
2013-09-23 23:16:04 +00:00
Gustavo
3e01ab5d29
republish only for matterhorn integration
2013-09-23 23:15:07 +00:00
Gustavo
6acbc14103
separate rebuild and rebuild all
2013-09-23 22:36:53 +00:00
Gustavo
d03114846a
angle brackets for params
2013-09-23 21:51:46 +00:00
Nadia Noori
c2c344ed79
Changing lable to RC1
2013-09-04 14:24:19 -04:00
Calvin Walton
25dff30213
Add a big fat warning about the implications of leaving demos installed.
2013-08-30 17:03:54 -04:00
Calvin Walton
5267a7d2e1
Update the ffmpeg version check in bbb-conf
2013-08-27 11:04:02 -04:00
Fred Dixon
a306eac7cf
Modified test Java link in default.pdf
2013-07-27 19:34:25 -07:00
Fred Dixon
c60d739584
Updated defaut.pdf to have a link to test running a Java applet (for testing desktop sharing)
2013-07-27 19:16:15 -07:00
Fred Dixon
15ee5fc404
updated label to 0.81-beta-2
2013-07-23 20:30:21 -07:00
Calvin Walton
ab8882e50c
Add an ffmpeg version check to bbb-conf --check
2013-07-23 15:47:54 -04:00
Tyler Copeland
57b85b9c58
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2013-07-19 11:48:19 -04:00
Tyler Copeland
c40ae796d8
Updates to demo landing page
2013-07-19 11:47:32 -04:00
Jesus Federico
53dcbc82f8
bbb-lti: Restored xml extension to endPoint
2013-07-19 11:44:45 -04:00
Jesus Federico
dffdfa11ea
bbb-lti: Simplified the url generation for the LTI xml cartridge
2013-07-18 16:48:48 -04:00
Fred Dixon
54d7bfeab0
Fixed date on my VM, commits now have proper timestamp. Updated index.html to read 0.81-beta-2
2013-07-16 19:32:59 -07:00
Fred Dixon
1c7d220edc
Updated welcome message footer to 0.81-beta-2
2013-06-18 05:17:24 -07:00
Fred Dixon
253636ebf6
Updated version to 0.81-beta-2
2013-06-18 05:07:56 -07:00
Fred Dixon
e08c6802d4
Update configuration to record desktop sharing by default
2013-06-15 08:25:09 -07:00
Fred Dixon
81988c2e68
Updated index.html page to read 0.81-beta
2013-06-16 06:59:08 -07:00
Fred Dixon
d05d2df02e
Updated release to 0.81-beta
2013-06-15 03:00:45 -07:00
Fred Dixon
4854934faf
Added --setsecret and --secret
2013-06-15 02:28:18 -07:00
Fred Dixon
5b963b5c58
Added --setsecret
2013-06-14 23:38:19 -07:00
Fred Dixon
37cecc3259
Removed auto focus from joining demo meeting
2013-06-11 17:51:49 -07:00
Fred Dixon
8080c4c969
Simplifying the default welcome presentation
2013-06-11 16:23:19 -07:00
Fred Dixon
5935f8b1b0
More tweeks to the default presentation
2013-06-08 15:48:26 -07:00
Fred Dixon
b5080d7aca
Reording of content on index.html page
2013-06-08 15:03:47 -07:00
Fred Dixon
508c5e3b89
Output correct icon URL for LTI in bbb-conf --lti
2013-06-08 14:15:58 -07:00
Fred Dixon
bc0f5c8987
Minor font changes to default presentation for BigBlueButton 0.81
2013-06-08 12:57:06 -07:00
Fred Dixon
16e64ddf06
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2013-06-08 12:40:30 -07:00
Fred Dixon
086c49633c
Updated default presentation for BigBlueButton 0.81
2013-06-08 12:40:20 -07:00
Fred Dixon
2cdaf09be1
Minor updates to index.html page
2013-06-08 10:46:41 -07:00
Jesus Federico
a6c512be3d
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton
2013-06-08 10:26:55 -07:00
Jesus Federico
d05a434d3f
bbb-lti: Updated bbb-conf for fixing icon and base url
2013-06-08 13:26:04 -04:00
Fred Dixon
33a9c92b39
Reformatting of the index.html page
2013-06-07 14:14:20 -07:00
Tyler Copeland
813816d18d
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2013-06-05 23:46:05 -04:00
Tyler Copeland
a786af2b57
fixed images on landing page
2013-06-05 23:45:57 -04:00
Tyler Copeland
067e33d64b
Updated images on demo landing page
2013-05-31 16:42:06 -04:00
Tyler Copeland
663dcac797
demo landing page updates
2013-05-31 16:38:44 -04:00
Markos Calderon
ffbabcf51d
remove and add strings for the localization file
2013-05-27 17:56:48 -05:00
Markos Calderon
886772658e
add instructions for check the usage of localization strings
2013-05-24 19:59:39 -05:00
Fred Dixon
ba7ba649b2
Added direct link to developer video
2013-06-02 04:27:54 -07:00
Fred Dixon
676408e646
Minor tweak to increase the height of border on default landing page
2013-05-12 11:54:57 -04:00
Fred Dixon
06c2480e10
Fixed typo
2013-05-09 16:49:08 -07:00
Fred Dixon
05597f12e3
bbb-conf now checks that the directory for serving the BigBlueButton client exists
2013-05-05 18:04:11 -04:00
Fred Dixon
d93c44d156
Edited cron.daily to ensure it removes older presentation directories in /var/bigbluebutton
2013-05-05 14:42:55 -07:00
Tyler Copeland
63eb97db66
Updated image for 081 landing page
2013-05-03 15:21:33 -04:00
Fred Dixon
7ff8bb2cff
Updated image for 0.81 overview video
2013-04-20 18:10:28 -07:00
Fred Dixon
8ebf42ccdf
Updated text on index.html page
2013-04-20 18:00:06 -07:00
Fred Dixon
ef9dc77c51
Updated index.html to link to overview video
2013-04-20 17:55:13 -07:00
Fred Dixon
abc074aaa1
Hide the network monitor and editing buttons for layouts module by defult
2013-04-16 19:23:20 -07:00
Fred Dixon
bdf3663bc4
Added link to BigBlueButton Google+ page on index.html
2013-04-12 21:00:26 -04:00
Fred Dixon
5d524be6b7
sudo bbb-conf --check now calls bbb-record --check to check for errors in recordings
2013-04-12 12:20:52 -04:00
Fred Dixon
fa791b0a90
Updated comments in /etc/cron.daily/bigbluebutton
2013-04-11 08:14:48 -04:00
Fred Dixon
ac79e858bf
updated copyright on index.html to 2013
2013-04-10 23:16:04 -04:00
Fred Dixon
071fb54b80
Added check to bbb-conf --check for ensuring ffmpeg is installed
2013-04-10 22:38:54 -04:00
Fred Dixon
777c3972d2
Updated bbb-conf to remove --setup-dev scripts. The script now refers developers to the wiki for detailed steps.
2013-04-10 22:07:22 -04:00
Fred Dixon
a8046aac78
Updates to bbb-conf to detect older version of bbb-freeswitch package
2013-04-09 20:42:38 -04:00
Gustavo Salazar
5b4c7307af
more conditions to rearchive
2013-04-08 15:26:37 -05:00
Gustavo Salazar
d1e1f6e497
find meetingId instead of description
2013-04-08 11:15:46 -05:00
Gustavo Salazar
0a74b3a722
map external meeting id with internal meeting id and vice versa
2013-04-05 17:37:05 -05:00
Gustavo Salazar
48a81ab593
make description of recording optional in bbb-record --watch
2013-04-05 15:57:34 -05:00
Gustavo Salazar
c30da2c641
dont use rearchive until feature is complete
2013-04-03 19:48:32 -05:00
Gustavo Salazar
5611a385de
Re-archive recording. Fix #1448
2013-04-03 19:13:02 -05:00
Gustavo Salazar
19d152ac80
enable or disable a recording workflow. Fix #1455
2013-04-03 18:01:38 -05:00
Fred Dixon
be24c16ca1
Updated bbb-conf to detect OpenOffice or LibreOffice
2013-03-29 22:00:46 -04:00
jfederico
2b23d9cea7
Merge branch 'bbb-lti_v0.1.1'
2013-03-13 11:30:46 -04:00
Fred Dixon
fc250716d9
Updated bbb-conf to support renaming of parameters (see issue 1398 in google issue tracker)
2013-02-03 17:08:38 -05:00
Fred Dixon
de47e2e65e
Updated license header to LGPL 3.0
2013-01-27 09:44:40 -05:00
jfederico
a0df920587
bbb-lti(v0.1.1): Added new vie for extended interface
2013-01-24 15:52:06 -05:00
Fred Dixon
4035b4a732
The command now counts the number of slides using either the raw or presentation dir
2012-10-30 21:19:10 -04:00
Fred Dixon
b5abbd803a
Added check to to check for mismatch salt in bbb-lti
2012-10-30 21:10:48 -04:00
Fred Dixon
83db16c293
Added support in bbb-conf to change hostname for LTI integration
2012-10-29 14:53:37 -04:00
Fred Dixon
db02664be3
bbb-conf --check now checks for bbb-lti package
2012-10-28 21:51:26 -04:00
Fred Dixon
f93c605149
Updated bbb-conf to detect if LTI package (bbb-lti) is installed and output configuration values with 'bbb-conf --lti'
2012-10-28 17:58:34 -04:00
Fred Dixon
d2c76c6120
Fixed typo in cut and paste
2012-10-25 18:49:18 -07:00
Fred Dixon
cbfb9027a1
Modified bbb-record --watch to use a combination of files in /var/bigbluebutton and /var/bigbluebutton/recording/raw as /var/bigbluebutton will have old files remove by /etc/cron.daily/bigbluebutton
2012-10-22 17:13:16 -04:00
Fred Dixon
3bfacee73f
Re-enabled /etc/cron.daily/bigbluebutton to remove old presentation and media files
2012-10-22 17:11:56 -04:00
Fred Dixon
f4fff9160c
Also update hostname for metadata.xml in /var/bigbluebutton/published ...
2012-09-12 15:14:45 -04:00
Fred Dixon
11520ab392
bbb-conf --setip now updates the hostname for playback of recordings in metadata.xml
2012-09-12 14:53:21 -04:00
Fred Dixon
4b79d140ba
bbb-record --check now checks if the IP address for a recording matches the value defined in bigbluebutton.properties
2012-09-12 14:52:36 -04:00
Gustavo Salazar
9b03ac4292
Use playerglobal 11.2 instead of 10.3 when setting development environment
2012-09-12 09:19:48 -05:00
Fred Dixon
f39eed5dfe
reverted changes to bbb-conf
2012-09-11 18:45:16 -04:00
Fred Dixon
7bad4ffab8
Also delete sanity recordings in bbb-record --deleteall
2012-09-11 18:41:32 -04:00
gustavo salazar
6d90e31b85
Set playback_host in bigbluebutton.yml
2012-09-10 16:12:10 -05:00
Fred Dixon
d3b694167f
Modified bbb-conf to not require slides.yml
2012-09-07 16:45:31 -04:00
Fred Dixon
e98d29e4b8
Added 'S' column in bbb-record --watch for Sanity check
2012-08-30 18:00:26 -04:00
Gustavo Salazar
59ac709833
Set ip address in presentation.yml using bbb-conf --setip.
2012-08-27 15:34:31 -05:00
Fred Dixon
9fa7cf3da6
Added bbb-record --clean to clean out process and publish log files for recordings
2012-08-21 21:05:22 -04:00
Fred Dixon
bcafbc6d48
Filter our ffmpeg output to stderror when looking for errors in /var/log/bigbluebutton/presentation/* and /var/log/bigbluebutton/slides/*
2012-08-21 20:51:24 -04:00
Fred Dixon
83006b0426
removed 'set -e' that was preventing bbb-record --debug from processing more log files
2012-08-21 20:43:31 -04:00
Fred Dixon
fe78f961bc
Fixed error that was not searching /var/log/bigbluebutton/prentation log files for errors when doing bbb-record --debug
2012-08-21 20:13:50 -04:00
Fred Dixon
b2767aaf68
Output settings in red5 video for capture video (true/false)
2012-08-21 19:17:14 -04:00
Fred Dixon
263e20e8b3
Made bbb-record executable
2012-08-18 20:39:09 -04:00
Fred Dixon
fb58d0c7cc
Updated bbb-conf for 0.81-dev
2012-08-18 18:33:37 -04:00
Gustavo Salazar
9b2c56a13a
Republish recording using bbb-record utility.
2012-08-13 16:25:57 -05:00
Gustavo Salazar
e523dbf9e6
Merge pull request #55 from mconf/video-playback-into-master
...
Video playback
2012-08-03 09:08:25 -07:00
Felipe Cecagno
e8dc780c37
integrated the video playback into master, but the whiteboard events playback, as well as the presentation playback, is not functional yet - it seems that the writing.js is broken on master, tried to fix it without success
2012-08-01 17:40:58 -03:00
Gustavo Salazar
95d1a19e1e
Download playerglobal 11.2
2012-08-01 15:51:50 -05:00
Fred Dixon
840b9c8368
Added check in bbb-conf to ensure beans.presentationService.defaultUploadedPresentation URL is reachable
2012-07-28 16:01:44 -04:00
Fred Dixon
2addc78f59
Incremented version on landing page to 0.81-dev
2012-07-17 16:30:35 -04:00
Fred Dixon
f1b39de986
Modified version to be consistent
2012-07-17 16:29:13 -04:00
Fred Dixon
0dd9ab46f0
Added a text file for tracking release. This will be placed in /etc/bigbluebutton/bigbluebutton-release
2012-07-16 18:25:07 -04:00
Fred Dixon
f6caf218a4
Updated Copyright to 2012
2012-06-08 21:02:53 -04:00
Fred Dixon
27d01b29e7
Updated Copyright to 2012
2012-06-08 20:46:17 -04:00
Fred Dixon
c0c688a743
Updated Copyright to 2012
2012-06-08 20:44:45 -04:00
Fred Dixon
c5fc27731b
Updated Fork Me on GitHub banner to use proper URL
2012-06-08 20:43:35 -04:00
Fred Dixon
079c830647
Changed index.html page to state 0.8
2012-06-08 20:25:19 -04:00
Richard Alam
b4c939a99f
- change to RC3
2012-06-03 15:08:39 +00:00
Richard Alam
172205e107
- making change on landing page to say 0.8
2012-06-03 14:57:55 +00:00
Fred Dixon
113cbad759
Lowered check for 2G memory to under 1975
2012-05-11 09:49:58 -04:00
Fred Dixon
52302ce0a0
Updated version on index.html to RC2
2012-05-11 04:04:02 -04:00
Markos Calderon
71cc44eac2
fix for issue 1221. However, need to double check which it's the best way to handle special characters
2012-05-17 15:12:42 -07:00
Fred Dixon
5ca7a51034
Added logic to clean more log files when running sudo bbb-conf --clean
2012-05-03 23:17:58 -04:00
Fred Dixon
aba4c587fe
Minor edit on version in index.html
2012-04-27 10:55:07 -04:00
Fred Dixon
5a076109e2
Updated version number to 0.8-RC1 -- more testing
2012-04-27 10:40:53 -04:00
Fred Dixon
cf003b06a1
Added sum of version numbers for packages in bbb-conf --check
2012-04-25 20:54:51 -04:00
Fred Dixon
907aed9077
Increased version number to 0.8-beta-4c -- we're getting close
2012-04-25 17:17:39 -04:00
Fred Dixon
3aada13ae2
Added link for BigBlueButton in index.html
2012-04-05 10:56:05 -04:00
Fred Dixon
36c701eb4a
Updated demo page to show 0.8-beta-4b
2012-04-04 18:13:04 -04:00
Fred Dixon
8b7207622c
bbb-conf --check now skips commented entries for sip.server.host
2012-03-17 11:39:56 -04:00
Gustavo Salazar
3ceb87ff59
Delete presentations of recording when using bbb-record --delete
...
MEETING_Id.
2012-03-14 10:08:25 -05:00
Richard Alam
4410956fc1
- missed one line with "source" dir
2012-03-09 19:32:14 +00:00
Fred Dixon
01b34e7f1f
Disable the cron.daily job for now. We don't want to delete the source files for recordings here; rather, in the rap-worker.rb
2012-03-05 10:03:36 -05:00
Fred Dixon
ef87f09ba6
Minor edits to bbb-conf
2012-03-04 22:16:37 -05:00
Fred Dixon
4d6c2c1bea
Updated default.pdf for the new mute/unmute buttons
2012-03-04 21:32:14 -05:00
Fred Dixon
738efd4e48
Fixing typos in bbb-conf
2012-03-04 19:18:35 -05:00
Fred Dixon
6cb40fcb81
Improved warning messages for bbb-conf
2012-03-03 20:35:28 -05:00
Richard Alam
34d6ed968c
add gradle resolveDeps into intructions
2012-02-28 11:06:10 -08:00
Richard Alam
ea599ff213
no need to modify anything in nginx for bbb-apps
2012-02-28 11:02:50 -08:00
Richard Alam
4b30333b0b
- add tools option for --setup-dev
2012-03-02 19:03:24 +00:00
Fred Dixon
f220db6bf2
Minor updates
2012-03-02 10:53:07 -05:00
Fred Dixon
cd01147a1a
Removed set -x debugging in bbb-record
2012-03-01 14:51:09 -05:00
Fred Dixon
16ffb35595
bbb-conf and bbb-record now print the current BigBlueButton version defined in /etc/bigbluebutton/bigbluebutton-release
2012-02-28 10:06:29 -05:00
Fred Dixon
6e507f89f0
Minor edits
2012-02-27 19:10:18 -05:00
Gustavo Salazar
d07efdc0fa
Delete just one recording using bbb-record.
2012-02-27 11:40:35 -05:00
Fred Dixon
31a8332eb2
Added --check and --debug to bbb-record
2012-02-26 15:00:37 -05:00
Fred Dixon
f55f62d23b
More updates to setting up the development environemnt. Now works on any user account on BigBlueButon server. Account must have sudo priviledges
2012-02-25 20:35:58 -05:00
Fred Dixon
1f2ded16f7
Modifications to bbb-conf to setup development environment for client on any account.
2012-02-23 13:52:13 -05:00
Fred Dixon
742df4e50a
testing updates to steps to simplify setting up the development environment
2012-02-22 17:33:22 -05:00
Fred Dixon
24c1c69156
Added logic in build.xml to copy config.xml and join-mock.xml if not in the bigbluebutton-client source tree
2012-02-22 17:32:55 -05:00
Fred Dixon
fe61d3e7d5
Saving of desktop sharing video defaults to false (not needed for built-in slides)
2012-02-19 15:20:52 -05:00
Fred Dixon
cef4401df5
Updated error checking in bbb-record and error messages in bbb-conf
2012-02-19 12:34:21 -05:00
Fred Dixon
5b812140b7
Fixed error that would cause multiple IP addresses when checking for port 5060 and comparing it with sip.server.host
2012-02-12 11:47:56 -05:00
Fred Dixon
cb937ec129
changed --setfreeswitchip to --setsipip in bbb-conf
2012-02-10 14:45:41 -05:00
Fred Dixon
870fc275c6
Updating the default.pdf (which is loaded by default on each session) with more information for first-time users.
2012-02-10 14:44:41 -05:00
Tyler Copeland
352e3a4eec
BigBlueButton CSS fixes
2012-01-26 16:08:13 -05:00
Tyler Copeland
68d987f030
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2012-01-26 15:39:24 -05:00
Tyler Copeland
b50a89436d
New BigBlueButton Landing Page
2012-01-26 15:38:35 -05:00
Tyler Copeland
fa54fdbf98
New BigBlueButton Landing Page
2012-01-26 15:35:04 -05:00
Fred Dixon
01d1fdd256
Updated bbb-conf to have more checks (and solutions) when it detects that BigBlueButton might not be connecting to FreeSWITCH
2012-01-21 16:40:40 -05:00
Fred Dixon
b8af5fb241
Added warning in bbb-conf for meaning of removeMeetingWhenEnded=false in /var/lib/tomcat6/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties
2012-01-19 21:33:04 -05:00
Fred Dixon
77bb96a0bb
Testing with the BigBlueButton VM for setting up a development environment
2012-01-15 20:20:24 -05:00
Fred Dixon
dfa84d031f
Preparting for release of 0.8-beta-4
2012-01-15 12:32:59 -05:00
Richard Alam
7d47c240e4
Merge pull request #22 from gugat/issue963
...
Find ascii problem while archiving events
2012-01-11 13:28:15 -08:00
Richard Alam
9c8aeae213
- if there are no pre-uploaded presentation passed through the api, pre-upload a default presentation
2012-01-10 16:25:46 +00:00
gugat
3a72db66ba
Change string to search the error about events because of encoding. "on ASCII"
2012-01-06 18:31:24 -05:00
gugat
a98fecc2c7
Check if ASCII problem exists when events are not archived.
2012-01-06 12:34:33 -05:00
gugat
ea2c453807
Add info log messages from each method of generators
...
Add info log messages from publish script of slides. The log was empty before, was just created.
Add --check option to bbb-record. Taking same logic from bbb-conf and adding info about the failed task with each error.
2012-01-05 17:07:34 -05:00
Fred Dixon
bb8b64aff6
removed --version flag from bbb-record
2011-12-08 15:10:53 -08:00
Fred Dixon
2e604558b8
bbb-conf now correctly checks out git-core when setting up development environment
2011-11-21 11:09:20 -08:00
Fred Dixon
80ebe82610
Added sorting of modification date to demo10.jsp
2011-11-21 09:20:31 -08:00
Fred Dixon
b627af54fe
Added demo4/jquery.min.js (older version) for demo4.jsp
2011-11-20 11:15:07 -08:00
Fred Dixon
fc71c3c0eb
Added more checks to bbb-record --watch to monitor the processing of a recording
2011-11-20 06:33:55 -08:00
Fred Dixon
1832ed1da4
Updating index.html for beta-3
2011-11-08 18:51:53 -08:00
Fred Dixon
b557c4f623
Made /etc/cron.daily/bigbluebutton executable
2011-11-08 16:24:15 -08:00
Fred Dixon
196eadfdb8
Added cron.daily job to remove presentations older than 11 days, and remove recordings for desktop sharing and webcams (if present)
2011-11-08 15:23:47 -08:00
Fred Dixon
1b92aff1ef
Updated index.html page to read 0.8-beta-2
2011-09-29 18:15:20 -07:00
Fred Dixon
b81b5bcab1
removed formatter:lengthFormat from demo10.jsp to have length appear
2011-09-27 15:45:02 -07:00
Fred Dixon
aaeb2bb186
Fixed small typo for bbb-record --watch
2011-09-11 14:11:50 -07:00
Fred Dixon
581c104afc
added --list to list all recordings, --watch now watches the processing of the top 20 recordings
2011-09-10 06:35:32 -07:00
Fred Dixon
3ce3820e89
More cleanup for the API demos
2011-09-04 15:27:19 -07:00
Fred Dixon
ba6853c9c8
Refactored bbb_api.jsp to be consistent and reduced number of calls (still a bit more work needed to do)
2011-09-03 11:32:32 -07:00
Fred Dixon
9efab14768
Fixed bug that prevented bbb-record from having bbb-record-core rebuilt a recording.
2011-08-31 14:45:38 -07:00
Fred Dixon
5c2bd92fab
Added more tracking of recording processing to bbb-record --watch
2011-08-31 11:55:20 -07:00
Fred Dixon
c2dda53ff1
Added logic to rebuild the output for a specific recording
2011-08-30 13:12:37 -07:00
Fred Dixon
31c4f79087
Added bbb-record, a shell script with some helper functions to monitor and administrate the recordings.
2011-08-25 15:47:03 -07:00
Fred Dixon
9e9db371e2
Modified index.html for 0.8-beta. Added checks in bbb-conf --check to ensure redis was running
2011-08-20 12:13:03 -07:00
Fred Dixon
35825c29fe
Updated to demo10.jsp (record and playback) to have ten demo rooms
2011-08-18 10:56:31 -07:00
Fred Dixon
a072683541
Removing references to ActiveMQ from bbb-conf
2011-08-17 14:47:09 -07:00
Fred Dixon
0db28dfb3a
Updated bbb-conf --check to use /var/lib/tomcat6/webapps/demo for checking configuration of BigBlueButton API demos
2011-08-08 07:11:05 -07:00
Richard Alam
21acb8e566
- change simple to slides
2011-07-20 14:57:11 -04:00
Fred Dixon
74693999b7
Changed links on index.html to point to /demo/demo1.jsp instead of /bigbluebutton/demo/demo1.jsp
2011-07-14 10:10:44 -07:00
Fred Dixon
247f845e98
Added support for bbb-conf to update host in simple.yml (record and playback)
2011-07-10 08:54:43 -07:00
Fred Dixon
09d72242f8
Starting to add logic in bbb-conf to help debug record and playback
2011-06-26 10:42:31 -07:00
Fred Dixon
6bc82d4710
Changed version in index.html from 0.71a to 0.8-dev
2011-06-08 18:11:50 -07:00
Fred Dixon
9477de78f3
switched /etc/init.d/freeswitch to /etc/init.d/bbb-freeswitch
2011-05-27 15:54:09 -07:00
Richard Alam
9c6b27fb5f
Merge branch 'master' into record-and-playback-feature
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
2011-03-18 15:43:39 -04:00
Fred Dixon
16873c0683
Fixed #671 : Prevent users from entering the demo meeting with empty username
2011-03-16 15:57:42 -04:00
Fred Dixon
2849a4c420
Fixed bug #834
2011-02-28 21:19:23 -05:00
Richard Alam
b42b43079b
Merge branch 'master' into record-and-playback-feature
2011-01-18 17:36:47 -05:00
Fred Dixon
873103b533
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-01-16 16:39:18 -08:00
Fred Dixon
648a49fdf2
Fixed a bug with incorrect updating of security salt with --setsalt
2011-01-16 16:39:02 -08:00
Richard Alam
6b97c99817
Merge branch 'master' into record-and-playback-feature
...
Conflicts:
bigbluebutton-client/.actionScriptProperties
bigbluebutton-client/.flexProperties
2011-01-11 16:08:12 -05:00
Richard Alam
be02e9adbf
- changing to version 0.71a
2011-01-11 13:54:42 -05:00
Fred Dixon
68a31cb15f
- Changed the version in index.html to 0.71a
2011-01-10 22:09:07 -05:00
Marco Calderon
d6c8b30e19
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2010-12-17 12:03:11 +00:00
Fred Dixon
e75e779e04
- Don't check for symbolic link for /etc/nginx/sites-enabled/bigbluebutton if running on the Intalio VM
2010-12-13 21:25:59 -05:00
Fred Dixon
26e0bbfdac
- More checks to ensure jetty has started before trying to check if BigBlueButton web is running
2010-12-13 19:25:34 -05:00
Fred Dixon
0ead92fc94
- Modified bbb-conf so it can use jetty and tomcat6 as a servlet engine.
2010-12-12 20:12:22 -05:00
Fred Dixon
87f6b0a869
- Fixed bug #778
2010-12-12 13:31:41 -05:00
Marco Calderon
11167ae29f
added chrome plugin patch for test recording
2010-11-19 05:04:16 +00:00
Richard Alam
312b3f216b
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2010-11-10 09:55:00 -05:00
Fred Dixon
ad04fc4306
- Added code to take only the first IP address from ifconfig (see issue 729)
2010-11-10 07:49:46 -05:00
Fred Dixon
77fcbeeaf3
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2010-11-09 19:21:58 -05:00
Fred Dixon
9632b421e0
- Changed message in bbb-conf from 0.71-Beta to 0.71
2010-11-09 19:21:41 -05:00
Scott Morris
b498ea0569
Fixed <! for the DOCTYPE
2010-11-09 17:34:09 -05:00
Richard Alam
2e7c164f49
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2010-11-09 17:04:47 -05:00
Scott Morris
4b9f06d711
Fixed DOCTYPE tage
2010-11-09 17:04:43 -05:00
Richard Alam
add6f38872
- adding v0.71 tag to bbb-conf
2010-11-09 16:49:04 -05:00
Scott Morris
5214e1d6d0
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
...
Conflicts:
bigbluebutton-config/web/index.html
2010-11-09 16:40:53 -05:00
Scott Morris
b142b27010
Updated index.html to remove beta status!
2010-11-09 16:36:06 -05:00
Fred Dixon
6995b745f7
- Updating setting of IP address
2010-11-06 16:41:39 -04:00
Fred Dixon
6516f93d1c
- Small formatting change in the Waiting to startup message
2010-11-06 16:35:59 -04:00
Fred Dixon
8416e2410f
- Removed printing of sip.server.host on bbb-conf -c as it would cause confusion why it's the only variable with an IP address. Instead, added checks to ensure when FreeSWITCH is running, this variable matches the local IP address
2010-11-06 16:06:17 -04:00
Fred Dixon
fc542997ac
- Modified assignment of sip.server.host to be just IP address (not host name)
2010-11-04 21:48:48 -04:00
Fred Dixon
68f5c25a08
- Update bbb-conf to properly set sip.server.host
2010-11-03 21:07:55 -04:00
Fred Dixon
b963201509
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
...
Conflicts:
bigbluebutton-config/bin/bbb-conf
2010-11-03 21:06:17 -04:00
Fred Dixon
f9aa471ac1
- Added logic to reset settings for sip.server.host for asterisk or FreeSWITCH
2010-11-03 20:48:04 -04:00
Fred Dixon
13952f70c0
- bbb-conf now changes sip.server.host in /usr/share/red5/webapps/sip/WEB-INF/bigbluebutton-sip.properties when running FreeSWITCH
2010-11-01 13:06:29 -07:00
Fred Dixon
876a7f77d4
- Formatting updates
2010-10-30 20:11:27 -07:00
Fred Dixon
590bebad83
- Minor updates after switching between asterisk and FreeSWITCH
2010-10-30 17:28:27 -07:00
Fred Dixon
d5810f8512
- Ensure calls to nc always have a valide host/IP address (avoid endless loops for checking for ports)
2010-10-30 16:49:42 -07:00
Fred Dixon
df76508322
- Updates after testing switching between app_konference and freeswitch
2010-10-30 16:45:50 -07:00
Fred Dixon
887540daa7
- Updates to bbb-conf to now split out check_configuration and check_state. This allows it to check_configuration before attempting a restart and warn the administrator of any settings that could affect bbb-conf --restart or bbb-conf --clean.
2010-10-30 14:41:21 -07:00
Fred Dixon
3ef3d34dd7
- Print out version of BigBlueButton Server when user types bbb-conf --check
2010-10-24 18:38:07 -07:00
Fred Dixon
d8c1d75924
- Added app_konference-10.04-64.so from Generic Conferencing
2010-10-24 17:05:13 -07:00
Fred Dixon
52024a891b
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2010-10-23 19:07:43 -07:00
Fred Dixon
0f3ae381b7
- Making small changes to test VM
2010-10-23 19:07:34 -07:00
Fred Dixon
90a34ee8c9
- Added more checks for errors when installing either asterisk or FreeSWITCH before BigBlueButton.
2010-10-16 22:45:42 -04:00
Fred Dixon
55ed2eeeec
- Detect whether asterisk or freeswitch is installed, but warn if both are present
2010-10-16 21:27:12 -04:00
Fred Dixon
e2750b6419
- Added checks bin bbb-conf to see if bbb-voice-conference or bbb-freeswitch-config are installed
2010-10-16 20:51:49 -04:00
Fred Dixon
7f64ad3c77
updated index.html from 0.71-dev to 0.71-beta
2010-10-15 11:05:18 -04:00
Scott Morris
21848d21af
Changed an ambiguous message to be more understadable
2010-10-14 20:14:13 +00:00
Fred Dixon
76fdf8c8b6
- Updated index.html for 0.71-dev testing
2010-10-09 22:10:21 -04:00
Fred Dixon
216713afaa
- added a check to ensure the when start_bigbluebutton finishes, BigBlueButton is ready to receive connections
2010-10-09 18:35:15 -04:00
Fred Dixon
36bfbdeac1
-added --stop and --start to bbb-conf; -accelerated --restart by removing sleep statements
2010-10-09 18:10:24 -04:00
Fred Dixon
bf245bd482
- Removed localization dendency in bbb-conf for inet addr:
2010-10-09 16:39:06 -04:00
Fred Dixon
8ae90f5916
- added more error checking to bbb-conf
2010-10-07 18:56:33 +00:00
Fred Dixon
26d4622ccd
- Fixed detection of architecture in bbb-conf
2010-10-05 20:03:57 +00:00
Fred Dixon
3f7cd420b6
- Set Freeswitch event socket layer to listen on 127.0.0.1
...
- Added checks in bbb-conf to test ports 80, 1935, and 9123 to aid in setting up BigBlueButton behind a firewall
2010-10-04 03:27:23 +00:00
Fred Dixon
f10acd0e7c
- small change to test updating of devbuild.bigbluebutton.org
2010-09-28 08:35:04 -04:00
Fred Dixon
ff32c97a46
Testing updates to bbb-conf
2010-09-25 17:25:17 +00:00
Fred Dixon
9cfb18bddb
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2010-09-20 20:26:52 +00:00
Fred Dixon
48b38baef4
index.html now says 0.70-dev
2010-09-20 20:26:45 +00:00
Fred Dixon
db89deba78
Added more checks to bbb-conf & set esl.host=127.0.0.1 in bigbluebutton.properites so we don't need to assign an IP address for red5 to connect to freeswitch
2010-09-20 01:47:17 +00:00
Fred Dixon
d8ebb7b44b
changed version of bbb-conf to 0.71-dev
2010-09-19 15:11:35 +00:00
Fred Dixon
b72bb27b86
moving these configuration files into git
2010-09-18 23:24:04 +00:00
Richard Alam
4da5d1b127
- start freeswitch or asterisk depending on what's configured in red5/bigbluebutton/WEB-INF/red5-web.xml
2010-09-15 16:21:55 -04:00
Richard Alam
49f3afa8b9
- determine which conference app (freeswitch or asterisk) we are running and start it
2010-09-15 12:03:31 -04:00
Richard Alam
706e9e76ff
- remove all bbb-web.log when running bbb-conf --clean
2010-09-15 11:02:41 -04:00
Richard Alam
a8bf1afc73
- fix to checkout 0.7 tag when running bbb-conf --checkout
2010-09-03 15:03:27 -04:00
Sebastian
988d4eb117
Added cat /etc/lsb-release to bbb-conf --check
2010-08-31 09:48:54 -04:00
Sebastian
d3b9525796
bbb-conf --conference/--salt/--setip print out now the current values instead of the whole help text
2010-08-30 14:28:27 -04:00
Sebastian
5822491082
Restarting the whole bigbluebutton server now after bbb-conf --setip
2010-08-26 15:25:34 -04:00
Sebastian
715c7856f8
Added a change of the ip adress to bigbluebutton-sip.properties
2010-08-26 14:38:40 -04:00
Sebastian
3e86ecafef
Fixed a bug, which added "" to esl.host
2010-08-26 14:34:03 -04:00
Sebastian
d8c249cbac
--setip now changes the event conf ip for freeswitch
2010-08-26 14:27:19 -04:00
Sebastian
9b6a2e2314
Added more code to change the listen-ip in event_socket_conf.xml more safe
2010-08-25 13:53:25 -04:00
Sebastian
251e0ff43e
Rewrote some code for switching to konference and freeswitch
2010-08-25 13:03:37 -04:00
Sebastian
909bb81e35
Fixed a bug in switching to freeswitch
2010-08-25 13:01:15 -04:00
Sebastian
aad067d430
Fixed some bugs in bbb-conf
2010-08-25 12:53:01 -04:00
Sebastian
a3a65e2b1f
Added code to check if asterisk and freeswitch are running parallel; added code to --check to detect if asterisk or freeswitch is running
2010-08-23 14:28:37 -04:00
Sebastian
0b7093f191
Added a check for freeswitch and bbb-openoffice-headless to --check
2010-08-23 12:12:04 -04:00
Sebastian
3105a6c53a
Added a switch to switch between asterisk, meetme and freeswitch
2010-08-23 09:49:54 -04:00
Sebastian
81e727d72f
Changed the restart scripts to restart freeswitch instead of asterisk
2010-08-11 13:27:50 -04:00
Sebastian
f007213adc
Fixed a bug in setting the esl value in bigbluebutton.properties
2010-08-10 11:09:16 -04:00
Sebastian
274b912860
Added --set-salt to bbb-conf
2010-08-09 15:39:35 -04:00
Sebastian
54ccec0c51
Modified an error message
2010-07-15 12:55:42 -04:00
Sebastian
ae5baa22ab
Added a sleep 5 to give the server more time to start up
2010-07-15 12:51:14 -04:00
Sebastian
c310fbda33
Updated the index.html
2010-07-15 10:12:32 -04:00
Richard Alam
cbb58ca839
- adding join-mock to setupdev client
2010-07-14 16:30:53 -04:00
Sebastian
27e45ae4a5
Added a check for host comparison with the ip
2010-07-14 11:55:33 -04:00
Sebastian
e40edd9e82
Fixed bugtracking #113
2010-07-14 11:30:49 -04:00
Sebastian
cc3af139e7
Changed How-To-Videos to View Intro Videos
2010-07-14 09:17:30 -04:00
Sebastian
369c66001e
Fixed a bug for cacheexceptionhandler
2010-07-13 19:09:50 -04:00
Sebastian
094bb00205
Removed a check for root
2010-07-13 18:59:07 -04:00
Sebastian
8f195e093b
Updated checking, added output of main memory
2010-07-13 17:13:49 -04:00
Sebastian
ac57056386
Cleaned up bbb-conf, added extra log checking
2010-07-13 16:14:26 -04:00
Sebastian
5bfa77fd69
Added a link pointing to how-to videos
2010-07-13 11:10:32 -04:00
Richard Alam
7de859ee85
- minor cleanup
2010-07-13 10:33:51 -04:00
Richard Alam
a808ee5941
- add more info on bbb-conf
2010-07-13 10:18:56 -04:00
Richard Alam
fe92eef70c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2010-07-13 09:44:06 -04:00
Richard Alam
ec256e7cb7
- upgrading versions from 0.64 to 0.7
2010-07-13 09:42:13 -04:00
Sebastian
be432bd464
Added a root check to run --check; fixed a bug in --setup-samba
2010-07-13 09:20:22 -04:00
Sebastian
63a376a7cb
Fixed a bug in a check for deskshare
2010-07-12 14:06:01 -04:00
Richard Alam
44335ed03c
- change all dirs in /usr/share/red5/webapps to be writable when setting dev env
2010-07-12 12:52:51 +00:00
BigBlueButton
1d11cef390
- add sudo when creating soft link to sites-enabled/bigbluebutton
2010-07-11 18:21:31 +00:00
Richard Alam
0b8e3e8318
- removing unused files
2010-07-08 17:26:23 +00:00
Richard Alam
0a7c3f9599
- clean-up a bit
2010-07-08 17:09:17 +00:00
Sebastian
51d60ddf64
Added bbb-openoffice-headless to --restart
2010-07-08 13:16:26 -04:00
Richard Alam
4ef87f56fe
- when setting dev env for bbb-apps, check if the soft-link in /etc/nginx/sites-enabled/bigbluebutton is
...
still present, if not, create it. When setting up dev env bbb-apps the softlink gets deleted.
2010-07-08 15:47:52 +00:00
Richard Alam
f0aff2791d
- showing only potential problems
2010-07-07 21:11:27 +00:00
Richard Alam
cdad234fb2
- modifying bbb-conf --check and will add verbose option
2010-07-07 20:17:55 +00:00
Richard Alam
ba7be5ea1a
- adding more info and formatting output of bbb-conf --check
2010-07-07 17:52:49 +00:00
Richard Alam
a005f545a3
- shorten variable
2010-07-07 14:58:28 +00:00
Richard Alam
dcee771b83
- shorten variable
2010-07-07 14:57:20 +00:00
Richard Alam
47ab860b88
- cleanup
2010-07-07 14:47:33 +00:00
Sebastian
9c5afe284d
Modified error messages for red5 logs
2010-07-07 10:51:25 -04:00
Sebastian
c3bdffc234
Added more error checking for the sip server
2010-07-07 10:32:16 -04:00
Sebastian
ecb8937737
Cleaned up some code
2010-07-06 15:31:47 -04:00
Sebastian
ec020c8366
Added more error checking to bbb-conf
2010-07-06 14:48:33 -04:00
Sebastian
27eb428661
Changed the link the welcome logo on the startpage
2010-07-06 14:19:59 -04:00
Sebastian
7be6f9dff6
Modified some error messages
2010-07-05 15:48:41 -04:00
Richard Alam
a514051c3e
- copy the packaged config.xml into src/conf
...
- revert back previous change where in build.xml we copy the config.xml from client as we don't want to
always overwrite the config.xml everytime the dev runs ant. The dev may have a custom config.xml which
gets overwritten with what's packaged
2010-07-05 15:15:51 -04:00
Sebastian
4090f3ddfd
Added extra safe checks for the bigbluebutton file system
2010-07-05 13:02:04 -04:00
Sebastian
5788d28b53
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2010-07-05 13:01:14 -04:00
Sebastian
96e0164216
Added check for the kernel and cpu architecture in bbb-conf
2010-07-05 09:16:33 -04:00
Richard Alam
19667376b6
- copy or generate config.xml when setting up client dev environment
2010-07-04 12:49:05 -04:00
Richard Alam
bc19e5389f
- allow user to pass a repository to checkout from. The default will be github.com/bigbluebutton/bigbluebutton
...
if the user does not pass anything on bbb-conf --checkout
2010-07-03 15:37:56 +00:00
Richard Alam
b62681ba2c
- remove --trunk option as git clone checks-out everything
2010-07-05 10:39:13 -04:00
Sebastian
da9f036339
Removed a space character in demo_footer.jsp
2010-07-02 14:15:30 -04:00
Sebastian
2e664ad0b3
Fixed a bug in bbb-conf
2010-07-02 10:30:24 -04:00
Sebastian
948837859c
Added extra error checking for logs
2010-06-30 15:57:39 -04:00
Richard Alam
e46388e03a
- reverting back to previous change as the last change was incorrect
2010-06-30 19:51:26 +00:00
BigBlueButton
b0790283c9
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2010-06-30 19:35:22 +00:00
Richard Alam
be77950c34
- fix bbb-conf --revert which still points to the old client-dev dir
2010-06-30 19:35:05 +00:00
Sebastian
bffd3a60f5
Added extra error checking in bbb-conf
2010-06-30 15:28:54 -04:00
BigBlueButton
9b1be73d61
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2010-06-28 20:11:11 +00:00
BigBlueButton
3ced173986
- modify to checkout code from git and setup dev env for client|web|apps
2010-06-28 20:10:29 +00:00
Sebastian
56c43c3f01
Fixed a bug in switching from meetme to konference and vice versa
2010-06-28 15:28:41 -04:00
Sebastian
ce2e493c01
fixed a bug in the --salt function
2010-06-28 14:35:31 -04:00
firstuser
ed4ceb712b
Added the ability to change the security salt
2010-06-25 12:11:36 -04:00
firstuser
3a9f2e7590
updated to 0.70 / cleaned up some code
2010-06-21 13:45:45 -04:00
Sebastian
207b102f02
Updated the index.html to 0.70-dev
2010-06-04 16:21:01 -04:00
Omar Shammas
f038d5c350
Minor reformatting of checks for tomcat in bbb-conf
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4267 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-07 17:48:30 +00:00
Fred Dixon
2e4df94be9
Incrementing the revision number to 4125 so it matches that in bbb-conf
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4126 af16638f-c34d-0410-8cfa-b39d5352b314
2010-04-02 23:10:49 +00:00