diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
| commit | a6cb90c81c29663e96d4fd96acd43fde1c28ac15 (patch) | |
| tree | 24d116fb5fe6b1e2687f833cee9685d6480a95eb /view/en/cert_bad_eml.tpl | |
| parent | b467dc4f0055452b65fac842d1294ec9cc978445 (diff) | |
| parent | 51b89f0ed8833004cf695de90791d8d0eec550b5 (diff) | |
| download | volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.gz volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.bz2 volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.zip | |
Merge branch 'master' into tres
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
Diffstat (limited to 'view/en/cert_bad_eml.tpl')
| -rw-r--r-- | view/en/cert_bad_eml.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/en/cert_bad_eml.tpl b/view/en/cert_bad_eml.tpl index f4b197131..e42b9696c 100644 --- a/view/en/cert_bad_eml.tpl +++ b/view/en/cert_bad_eml.tpl @@ -1,11 +1,11 @@ This is the webserver at {{$sitename}}; A routine check indicates the SSL certificate for this website is -not valid. Your website cannot fully participate in the RedMatrix +not valid. Your website cannot fully participate in the Hubzilla until this is resolved. Please check your certificate and with your certificate provider or service provider to ensure it is "browser valid" and installed correctly. Self-signed certificates are NOT SUPPORTED -and NOT ALLOWED in the RedMatrix. +and NOT ALLOWED in the Hubzilla. The check is performed by fetching a URL from your website with strict SSL checking enabled, and if this fails, checking again with SSL |