BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,524 Commits 13 Branches 260 Tags 1.1 GiB
8287fe04d7
Commit Graph

1353 Commits

Author SHA1 Message Date
Fred Dixon
88393b1aa7 Fix #8711 2020-03-05 12:23:53 -06:00
Anton Georgiev
d36c545706 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:41:18 +00:00
Anton Georgiev
8129468300 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:36:21 +00:00
Fred Dixon
76deb09506
Update bigbluebutton-release 2020-03-04 15:44:26 -05:00
Richard Alam
f8437fb19d Merge branch 'v2.2.x-release' of https://github.com/bigbluebutton/bigbluebutton into pres-url-on-page-convert 2020-03-01 05:38:04 -08:00
Fred Dixon
abc4998d2c
Update bigbluebutton-release 
Bump to rc-7
 2020-02-29 10:42:10 -05:00
Anton Georgiev
3754d0ab6f Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020 2020-02-28 17:47:06 -05:00
Richard Alam
c0372e3a97 Merge branch 'blank-presentation' of https://github.com/riadvice/bigbluebutton into riadvice-blank-presentation 2020-02-28 13:32:02 -08:00
Fred Dixon
0762f04fd7 Fix broken link 2020-02-24 12:34:05 -06:00
Ghazi Triki
0c96050fde Improvements to conversion default fall-back files and process. 2020-02-22 18:26:50 +01:00
Fred Dixon
d8a6099f5e Update to landing page text 2020-02-16 17:40:21 -06:00
Anton Georgiev
4b0452d1fd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master 2020-02-14 21:43:35 +00:00
Fred Dixon
a9f194b038 Bump to RC6 2020-02-04 11:28:01 -06:00
Fred Dixon
98a1b9115e Added start/stop for bbb-rap-caption-inbox.service 2020-01-27 18:37:04 -06:00
Fred Dixon
16f910253b Remove Flash related code 2020-01-25 12:54:12 -06:00
Fred Dixon
c1d2855b32 Update bbb-conf for resque services for record and playback processing 2020-01-20 13:59:54 -06:00
Fred Dixon
e8e11843e4 Remove checks for SWF tools 2020-01-17 19:46:31 -06:00
Calvin Walton
aee7baa76b Merge branch 'v2.0-rap-on-resque' of github.com:daronco/bigbluebutton 2020-01-17 17:40:08 -05:00
Ghazi Triki
9f0ede6d85 Store FreeSwitch logs in bbb-conf --zip. 2019-12-25 16:32:48 +01:00
Ghazi Triki
5d62864b3a Store more logs with bbb-conf --zip. 2019-12-25 15:25:17 +01:00
Fred Dixon
ecc98d824e bump to RC5 2019-12-18 13:42:19 -06:00
Calvin Walton
047f1b84ad Fix 'wget-log' issue in bbb-conf 
Switch to using curl instead, which doesn't have this problem (and
outputs to stdout by default, too)
 2019-12-17 17:10:09 -05:00
Fred Dixon
605e270727 Bump to RC-3 2019-12-07 13:26:54 -06:00
Leonardo Crauss Daronco
5e05b7a8e8 Fixes for the rap scripts after processing a real recording 2019-12-06 12:26:24 -03:00
Leonardo Crauss Daronco
62d62a2a1e Merge remote-tracking branch 'upstream/master' into v2.0-rap-on-resque 
# Conflicts:
#	bigbluebutton-config/bin/bbb-conf
#	record-and-playback/core/Gemfile.lock
#	record-and-playback/core/lib/recordandplayback/events_archiver.rb
#	record-and-playback/core/scripts/archive/archive.rb
#	record-and-playback/core/scripts/bigbluebutton.yml
#	record-and-playback/core/scripts/rap-process-worker.rb
#	record-and-playback/core/scripts/rap-publish-worker.rb
#	record-and-playback/core/scripts/rap-sanity-worker.rb
#	record-and-playback/core/scripts/rap-starter.rb
#	record-and-playback/core/scripts/sanity/sanity.rb
#	record-and-playback/core/systemd/bbb-rap-archive-worker.service
#	record-and-playback/core/systemd/bbb-rap-process-worker.service
#	record-and-playback/core/systemd/bbb-rap-publish-worker.service
#	record-and-playback/core/systemd/bbb-rap-sanity-worker.service
#	record-and-playback/core/systemd/bbb-record-core.target
 2019-12-04 17:33:44 -03:00
Fred Dixon
9f43ebd57a Bump master to 2.3.0-dev 2019-11-29 09:53:53 -06:00
Fred Dixon
d29cf3bba8 bump to RC-3 2019-11-29 05:36:48 -06:00
Calvin Walton
13fe03b74f bbb-record: Skip ".norecord" meetings when running --rebuildall 
Users don't expect not-recorded meetings to appear when rebuilding
all of their existing recordings.

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

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

The following needs working on:

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

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

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