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