From ca2dc1eab51e538993e24ac45811fbb29f8c60c8 Mon Sep 17 00:00:00 2001 From: Bob Mottram <bob@freedombone.net> Date: Tue, 20 Nov 2018 09:51:19 +0000 Subject: [PATCH] List clearnet apps separately --- doc/EN/apps.org | 20 ++++++++++---- website/EN/apps.html | 66 ++++++++++++++++++++++++++++++-------------- 2 files changed, 60 insertions(+), 26 deletions(-) diff --git a/doc/EN/apps.org b/doc/EN/apps.org index 64c6fe2db..d1c8104af 100644 --- a/doc/EN/apps.org +++ b/doc/EN/apps.org @@ -9,7 +9,9 @@ #+attr_html: :width 80% :height 10% :align center [[file:images/logo.png]] -* Apps available via the web interface +* Server apps + +These apps are available on all server versions of the system, either via clearnet or onion addresses. #+BEGIN_CENTER #+ATTR_HTML: :border -1 @@ -22,18 +24,15 @@ | [[./help_etesync.html][EteSync]] - End-to-end encrypted sync of calendar and contacts between devices. | | [[./help_etherpad.html][Etherpad]] - Collaborative document creation. | | [[./help_fedwiki.html][Federated wiki]] - A new approach to creating wiki content. | -| [[./help_friendica.html][Friendica]] - Federated social network system. | | [[./help_gnusocial.html][GNU Social]] - Federated social network. | | [[./help_gogs.html][Gogs]] - Lightweight git project hosting system. | | [[./help_htmly.html][HTMLy]] - Databaseless blogging system. | -| [[./help_hubzilla.html][Hubzilla]] - Web publishing platform with social network like features. | | [[./help_irc.html][IRC Server]] - Chat server with bouncer. | | [[./help_icecast.html][Icecast media stream]] - Make your own internet radio station. | | [[./help_kanboard.html][KanBoard]] - Simple kanban system for managing projects or TODO lists. | | [[./help_koel.html][Koel]] - Access your music collection from any internet connected device. | | [[./help_lychee.html][Lychee]] - Make your photo albums available on the web. | | [[./help_mailpile.html][Mailpile]] - Modern email client which supports GPG encryption. | -| [[./help_matrix.html][Matrix]] - Multi-user chat with some security and moderation controls. | | [[./help_mumble.html][Mumble]] - VoIP and text chat system. | | [[./help_nextcloud.html][NextCloud]] - File storage, chat and video conferencing. | | [[./help_peertube.html][PeerTube]] - Peer-to-peer video hosting. | @@ -41,12 +40,23 @@ | [[./help_pleroma.html][Pleroma]] - Fediverse instance compatible with GNU Social and Mastodon. | | [[./help_postactiv.html][PostActiv]] - Federated social networking system. | | [[./help_privatebin.html][PrivateBin]] - Pastebin where the server has zero knowledge of the content. | -| [[./help_riot.html][Riot Web]] - Web interface for the Matrix federated communications system. | | [[./help_rocketchat.html][Rocketchat]] - Non-federated chat server (x86 systems only). | | [[./help_smolrss.html][Smol RSS]] - Minimal RSS reader. | | [[./help_syncthing.html][Syncthing]] - Synchronise files across all of your devices. | | [[./help_turtl.html][Turtl]] - Privately create and share notes and images. | | [[./help_xmpp.html][XMPP]] - Chat server. | +#+END_CENTER + +* Clearnet server apps + +These apps are not available on the /onion only/ versions, since they can't currently be onion routed. + +#+BEGIN_CENTER +#+ATTR_HTML: :border -1 +| [[./help_friendica.html][Friendica]] - Federated social network system. | +| [[./help_hubzilla.html][Hubzilla]] - Web publishing platform with social network like features. | +| [[./help_matrix.html][Matrix]] - Multi-user chat with some security and moderation controls. | +| [[./help_riot.html][Riot Web]] - Web interface for the Matrix federated communications system. | | [[./help_zap.html][Zap]] - Nomadic social network server | #+END_CENTER diff --git a/website/EN/apps.html b/website/EN/apps.html index f97da66b7..6061a7537 100644 --- a/website/EN/apps.html +++ b/website/EN/apps.html @@ -4,7 +4,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> <title>Freedombone</title> -<!-- 2018-11-10 Sat 12:51 --> +<!-- 2018-11-20 Tue 09:50 --> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="generator" content="Org-mode" /> <meta name="author" content="Bob Mottram" /> @@ -152,8 +152,12 @@ for the JavaScript code in this tag. </div> <div id="outline-container-sec-1" class="outline-2"> -<h2 id="sec-1">Apps available via the web interface</h2> +<h2 id="sec-1">Server apps</h2> <div class="outline-text-2" id="text-1"> +<p> +These apps are available on all server versions of the system, either via clearnet or onion addresses. +</p> + <div class="center"> <table border="-1" cellspacing="0" cellpadding="6" rules="groups" frame="hsides"> @@ -198,10 +202,6 @@ for the JavaScript code in this tag. <td class="left"><a href="./help_fedwiki.html">Federated wiki</a> - A new approach to creating wiki content.</td> </tr> -<tr> -<td class="left"><a href="./help_friendica.html">Friendica</a> - Federated social network system.</td> -</tr> - <tr> <td class="left"><a href="./help_gnusocial.html">GNU Social</a> - Federated social network.</td> </tr> @@ -214,10 +214,6 @@ for the JavaScript code in this tag. <td class="left"><a href="./help_htmly.html">HTMLy</a> - Databaseless blogging system.</td> </tr> -<tr> -<td class="left"><a href="./help_hubzilla.html">Hubzilla</a> - Web publishing platform with social network like features.</td> -</tr> - <tr> <td class="left"><a href="./help_irc.html">IRC Server</a> - Chat server with bouncer.</td> </tr> @@ -242,10 +238,6 @@ for the JavaScript code in this tag. <td class="left"><a href="./help_mailpile.html">Mailpile</a> - Modern email client which supports GPG encryption.</td> </tr> -<tr> -<td class="left"><a href="./help_matrix.html">Matrix</a> - Multi-user chat with some security and moderation controls.</td> -</tr> - <tr> <td class="left"><a href="./help_mumble.html">Mumble</a> - VoIP and text chat system.</td> </tr> @@ -274,10 +266,6 @@ for the JavaScript code in this tag. <td class="left"><a href="./help_privatebin.html">PrivateBin</a> - Pastebin where the server has zero knowledge of the content.</td> </tr> -<tr> -<td class="left"><a href="./help_riot.html">Riot Web</a> - Web interface for the Matrix federated communications system.</td> -</tr> - <tr> <td class="left"><a href="./help_rocketchat.html">Rocketchat</a> - Non-federated chat server (x86 systems only).</td> </tr> @@ -297,6 +285,42 @@ for the JavaScript code in this tag. <tr> <td class="left"><a href="./help_xmpp.html">XMPP</a> - Chat server.</td> </tr> +</tbody> +</table> +</div> +</div> +</div> + +<div id="outline-container-sec-2" class="outline-2"> +<h2 id="sec-2">Clearnet server apps</h2> +<div class="outline-text-2" id="text-2"> +<p> +These apps are not available on the <i>onion only</i> versions, since they can't currently be onion routed. +</p> + +<div class="center"> +<table border="-1" cellspacing="0" cellpadding="6" rules="groups" frame="hsides"> + + +<colgroup> +<col class="left" /> +</colgroup> +<tbody> +<tr> +<td class="left"><a href="./help_friendica.html">Friendica</a> - Federated social network system.</td> +</tr> + +<tr> +<td class="left"><a href="./help_hubzilla.html">Hubzilla</a> - Web publishing platform with social network like features.</td> +</tr> + +<tr> +<td class="left"><a href="./help_matrix.html">Matrix</a> - Multi-user chat with some security and moderation controls.</td> +</tr> + +<tr> +<td class="left"><a href="./help_riot.html">Riot Web</a> - Web interface for the Matrix federated communications system.</td> +</tr> <tr> <td class="left"><a href="./help_zap.html">Zap</a> - Nomadic social network server</td> @@ -307,9 +331,9 @@ for the JavaScript code in this tag. </div> </div> -<div id="outline-container-sec-2" class="outline-2"> -<h2 id="sec-2">Apps available via ssh</h2> -<div class="outline-text-2" id="text-2"> +<div id="outline-container-sec-3" class="outline-2"> +<h2 id="sec-3">Apps available via ssh</h2> +<div class="outline-text-2" id="text-3"> <div class="center"> <table border="-1" cellspacing="0" cellpadding="6" rules="groups" frame="hsides"> -- GitLab