aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Rude <[email protected]>2017-07-31 03:35:43 -0500
committerMatt Rude <[email protected]>2017-07-31 03:35:43 -0500
commit743851b589a51f5ef2a195c0ad660143fec8fe7a (patch)
tree5ce18ce24180afc98e88bcd4e76dff82c7e9fd40
parent76b25b84ef61d8677e348e795093db6464dc6ba5 (diff)
downloadxmpp-site-743851b589a51f5ef2a195c0ad660143fec8fe7a.tar.gz
xmpp-site-743851b589a51f5ef2a195c0ad660143fec8fe7a.tar.bz2
xmpp-site-743851b589a51f5ef2a195c0ad660143fec8fe7a.zip
Move files from help/ to page/
-rw-r--r--_includes/clients.html4
-rw-r--r--index.html2
-rw-r--r--pages/chatsecure.md (renamed from help/chatsecure.md)0
-rw-r--r--pages/client_list.md (renamed from help/client_list.md)0
-rw-r--r--pages/clients.html (renamed from help/clients.html)0
-rw-r--r--pages/conversations.md (renamed from help/conversations.md)0
-rw-r--r--pages/definitions.md (renamed from help/definitions.md)0
-rw-r--r--pages/gajim.md (renamed from help/gajim.md)0
-rw-r--r--pages/generic-configuration.md (renamed from help/generic-configuration.md)0
-rw-r--r--pages/hal-robot.md (renamed from help/hal-robot.md)0
-rw-r--r--pages/help.md (renamed from help/help.md)6
-rw-r--r--pages/server-list.html41
-rw-r--r--pages/spark.md (renamed from help/spark.md)0
-rw-r--r--pages/supported_standards.md (renamed from help/supported_standards.md)0
-rw-r--r--pages/swift.md (renamed from help/swift.md)0
-rw-r--r--pages/using-conferences.md (renamed from help/using-conferences.md)36
-rw-r--r--pages/web-presence.md (renamed from help/web-presence.md)0
-rw-r--r--privacy-policy.md48
18 files changed, 93 insertions, 44 deletions
diff --git a/_includes/clients.html b/_includes/clients.html
index e0f7f32..a4352e6 100644
--- a/_includes/clients.html
+++ b/_includes/clients.html
@@ -1,6 +1,4 @@
-<h2>Other Server Compliance Grid</h2>
-
-
+<h2>List of Available Servers</h2>
<table class='table' style='width:100%'>
<thead>
diff --git a/index.html b/index.html
index a0a62e7..36cfefb 100644
--- a/index.html
+++ b/index.html
@@ -34,7 +34,7 @@ permalink: /
</div>
<div class="col-md-5">
- <h1>Connecting</h1>
+ <h1>Connecting...</h1>
<ul>
<li>Port: <b>5222</b></li>
<li>Domain: <b>{{ site.xmpp-url }}</b></li>
diff --git a/help/chatsecure.md b/pages/chatsecure.md
index 16e5803..16e5803 100644
--- a/help/chatsecure.md
+++ b/pages/chatsecure.md
diff --git a/help/client_list.md b/pages/client_list.md
index 34f3a7e..34f3a7e 100644
--- a/help/client_list.md
+++ b/pages/client_list.md
diff --git a/help/clients.html b/pages/clients.html
index 61580ab..61580ab 100644
--- a/help/clients.html
+++ b/pages/clients.html
diff --git a/help/conversations.md b/pages/conversations.md
index b9e46e1..b9e46e1 100644
--- a/help/conversations.md
+++ b/pages/conversations.md
diff --git a/help/definitions.md b/pages/definitions.md
index 2c6be8c..2c6be8c 100644
--- a/help/definitions.md
+++ b/pages/definitions.md
diff --git a/help/gajim.md b/pages/gajim.md
index 6d2d559..6d2d559 100644
--- a/help/gajim.md
+++ b/pages/gajim.md
diff --git a/help/generic-configuration.md b/pages/generic-configuration.md
index 67039db..67039db 100644
--- a/help/generic-configuration.md
+++ b/pages/generic-configuration.md
diff --git a/help/hal-robot.md b/pages/hal-robot.md
index acd1e8c..acd1e8c 100644
--- a/help/hal-robot.md
+++ b/pages/hal-robot.md
diff --git a/help/help.md b/pages/help.md
index 54a209c..9321e78 100644
--- a/help/help.md
+++ b/pages/help.md
@@ -4,7 +4,9 @@ title: Help
permalink: /help/
---
-<center><span class="fa fa-question-circle" style="font-size:60px;" aria-hidden="true"></span><h1>User Guides</h1></center>
+<div class="section-headder">
+ <center><span class="fa fa-question-circle" style="font-size:60px;" aria-hidden="true"></span><h1>User Guides</h1></center>
+</div>
<div class="col-md-4">
<h2>Client Guides</h2>
@@ -22,7 +24,7 @@ permalink: /help/
<ul>
<li><a href="{{ site.url }}/help/clients/">Client List</a></li>
<li><a href="{{ site.url }}/help/definitions/">Definitions</a></li>
-<li><a href="{{ site.url }}/help/generic-configuration/">Generic Configuration</a></li>{% if site.xmpp-conference-url and site.xep-0045 == 1 %}
+<li><a href="{{ site.url }}/help/generic-configuration/">Generic Configuration</a></li>{% if site.xmpp-conference-url %}
<li><a href="{{ site.url }}/help/using-conferences/">Using Conferences</a></li>{% endif %}
<li><a href="{{ site.url }}/help/web-presence/">Using Web Presence</a></li>
<li><a href="{{ site.url }}/help/hal-robot/">Using HAL Bot</a></li>
diff --git a/pages/server-list.html b/pages/server-list.html
new file mode 100644
index 0000000..e0276a6
--- /dev/null
+++ b/pages/server-list.html
@@ -0,0 +1,41 @@
+---
+layout: default
+title: Public XMPP Servers
+permalink: /help/server-list/
+---
+
+<div class="section-headder">
+ <center>
+ <span class="glyphicon glyphicon-info-sign" style="font-size:60px;" aria-hidden="true"></span>
+ <h1>List of Public XMPP Servers</h1>
+ </center>
+</div>
+
+<p>Below is a list of public XMPP servers you may register an account on. After you have registerd an account, you may connect to other users either on the same server, or on other servers (including this server). This list is by no means complete, the servers were selected because of their capabilities and adherence to standards.</p>
+
+<table class='table' style='width:100%'>
+ <thead>
+ <tr>
+ <th>Service Name</th>
+ <th>Registration Method</th>
+ <th><center>Website<br />Language</center></th>
+ <th><center>Service<br />Price</center></th>
+ <th><a href='https://xmpp.org/extensions/xep-0375.html'>XEP-0375</a> complient</th>
+ <th><a href='https://xmpp.org/extensions/xep-0368.html'>XEP-0368</a> complient</th>
+ <th><center>Tor Service</center></th>
+ </tr>
+ </thead>
+ <tbody>
+{% for service in site.data.clients-compliance %}
+ <tr>
+ <td style="min-width:150px;"><a href='{{ service.url }}'>{{ service.name }}</a></td>
+ <td style="min-width:150px;">{% if service.registration-url %}<a href="{{ service.registration-url }}">{{ service.registration }}</a>{% elsif service.registration %}{{ service.registration}}{% else %}<i>Unknown</i>{% endif %}</td>
+ <td><center>{{ service.language }}</center></td>
+ <td><center>{% if service.price %}{{ service.price }}{% else %}Free{% endif %}<center></td>
+ {% if service.xep-375 == 1 %}<td class=PASSED style="width:75px;"><center>Yes</center></td>{% else %}<td class=FAILED><center>No</center></td>{% endif %}
+ {% if service.xep-368 == 1 %}<td class=PASSED style="width:75px;"><center>Yes</center></td>{% else %}<td class=FAILED><center>No</center></td>{% endif %}
+ {% if service.tor %}<td class=PASSED><center>{{ service.tor }}</center></td>{% else %}<td class=FAILED><center>No</center></td>{% endif %}
+ </tr>
+{% endfor %}
+ </tbody>
+</table>
diff --git a/help/spark.md b/pages/spark.md
index 15709b3..15709b3 100644
--- a/help/spark.md
+++ b/pages/spark.md
diff --git a/help/supported_standards.md b/pages/supported_standards.md
index f3ef732..f3ef732 100644
--- a/help/supported_standards.md
+++ b/pages/supported_standards.md
diff --git a/help/swift.md b/pages/swift.md
index 420e58b..420e58b 100644
--- a/help/swift.md
+++ b/pages/swift.md
diff --git a/help/using-conferences.md b/pages/using-conferences.md
index 0a7bd68..aadd2d7 100644
--- a/help/using-conferences.md
+++ b/pages/using-conferences.md
@@ -10,27 +10,10 @@ permalink: /help/using-conferences/
XMPP is normally a single person to single person chat system, but it has the ability to also run conference rooms. A conference room or MUC (Multiple User Chat) allows users on the same server, or via [federation]({{ site.url }}/help/definitions/#federation), different servers or domains, to all connect to the same chat room. Similar to how IRC works.
-## Managing a Conference
-
-### Conference room options
-
-* <b>Name:</b> The name of the conference room.
-* <b>Description:</b> The conference room descriptions
-* <b>Persistent:</b> Prevent the room from being deleted after the last user leaves.
-* <b>Searchable:</b> Allows users to search for the room in the list of rooms on the server and connect.
-* <b>Change Subject:</b> Allow none <u>admins</u> to change the rooms subject.
-* <b>Password:</b> Set the password for the room; all users who wish to access the room, must use the password to enter.
-* <b>Moderated:</b> Moderated rooms require a admin to approve each message before it is delevered to the rest of the room.
-* <b>Members-Only:</b> Only allow members of the room to enter the room.
-* <b>History:</b> Maximum number of past messages to return by the server when a user connects.
-* <b>Logging:</b> Enable external logging for the room; when enabled, any user on the internet may view this log.
-
## Joining a Conference
### Connecting from local XMPP server
-
-
### Connecting from a federated XMPP server
By default the server will try to use [TLS]({{ site.url }}/help/definitions/#tls) if the other side supports it, and fall back to [dialback]({{ site.url }}/help/definitions/#dialback) if it does not or if the certificate is incorrect or not trusted.
@@ -45,10 +28,29 @@ When someone posts to a room a "large" (greater then 500 characters or 5 lines)
### HTTP File Upload
+A conference room shares uploaded files diffrently then a single person chat. When a file is uploaded in a conference room, the file is uploaded directly to the XMPP server, it is stored there and a URL is produced and sent to the other users in the conference room. The other users can then download the image from the URL that points back to the XMPP server. The URL is a randomly created ID and should be very hard, but not imposiable to guess the URL by a outside user.
+
+The upload services URL is <code class="highlighter-rouge">upload.mattrude.com</code>, the fingerprints are listed on the <a href="/certificates/">certificates</a> page.
+
### Security Labels
A security label, sometimes referred to as a confidentiality label, is a structured representation of the sensitivity of a piece of information. A security label is used in conjunction with a clearance, a structured representation of what information sensitivities a person (or other entity) is authorized to access, and a security policy to control access to each piece of information. Security Lables are described in <a href="https://xmpp.org/extensions/xep-0258.html">XEP-0258</a>.
+## Managing a Conference
+
+### Conference room options
+
+* <b>Name:</b> The name of the conference room.
+* <b>Description:</b> The conference room descriptions
+* <b>Persistent:</b> Prevent the room from being deleted after the last user leaves.
+* <b>Searchable:</b> Allows users to search for the room in the list of rooms on the server and connect.
+* <b>Change Subject:</b> Allow none <u>admins</u> to change the rooms subject.
+* <b>Password:</b> Set the password for the room; all users who wish to access the room, must use the password to enter.
+* <b>Moderated:</b> Moderated rooms require a admin to approve each message before it is delevered to the rest of the room.
+* <b>Members-Only:</b> Only allow members of the room to enter the room.
+* <b>History:</b> Maximum number of past messages to return by the server when a user connects.
+* <b>Logging:</b> Enable external logging for the room; when enabled, any user on the internet may view this log.
+
{% if site.fingerprints == 1 %}
## Certificate Fingerprints
diff --git a/help/web-presence.md b/pages/web-presence.md
index c5ee8e7..c5ee8e7 100644
--- a/help/web-presence.md
+++ b/pages/web-presence.md
diff --git a/privacy-policy.md b/privacy-policy.md
index c631c18..a9aa489 100644
--- a/privacy-policy.md
+++ b/privacy-policy.md
@@ -8,29 +8,35 @@ permalink: /privacy-policy/
Our general policy regarding your data is to save as much as needed and as little as possible. This document will try to explain what personal data we store and how we handle that.
-## What we store
-
-- Account data
- - The user name and a hash of your password
- - The date of your account creation.
-- Messages
- - Offline messages; <i>If someone sends you a message while you are offline that message will be stored until you get back online.</i>
- - Archive. By default we will be keeping an archive of your messages for later retrieval by yourself. This can come in handy if you log in with a new device and want access to your message history and is also required if you want to use the OMEMO encryption with multiple devices. You can opt-out of this by setting your server-side archiving preferences with your XMPP client.
-- vCard. Everything added to your contect card.
-- Files. Every file you share with a contact or a conference will be uploaded and stored for later retrieval by the recipients.
-- Other data
- - A list of your contacts (Roster, Buddylist). This list is maintained by you. You decide who goes on that list and who gets deleted.
- - Semi public data you are publishing for your contacts to see like your avatar or the OMEMO public keys.
- - Other private data your XMPP client might upload like a list of conference bookmarks.
-
-## What we don’t store
-
-* Your IP address or any information that could be inferred by that address like your location.
-* The time when you login. - Or more general the times when you use our services.
+## What is stored
+
+### Account data
+
+- The user name and a hash of your password
+- The date of your account creation.
+
+### Messages
+
+- **Offline messages** - <i>If someone sends you a message while you are offline that message will be stored until you get back online.</i>
+- **Archive** - By default we will be keeping an archive of your messages for later retrieval by yourself. This can come in handy if you log in with a new device and want access to your message history and is also required if you want to use the OMEMO encryption with multiple devices. You can opt-out of this by setting your server-side archiving preferences with your XMPP client.
+
+### vCard
+
+- Everything added to your **contect card**.
+
+### Files
+
+- **Every file** you share with a **contact** or a **conference** will be uploaded and stored for later retrieval by the recipients.
+
+### Other data
+
+- A list of your **contacts** (Roster, Buddylist). This list is maintained by you. You decide who goes on that list and who gets deleted.
+- Semi public data you are publishing for your contacts to see like your avatar or the OMEMO public keys.
+- Other private data your XMPP client might upload like a list of conference bookmarks.
## How your data is handled
-* If you delete your account all related information will be deleted with it. Including your files and messages.
-* All backups are encrypted.
+- If you delete your account all related information will be deleted with it. Including your files and messages.
+- All backups are encrypted.
Even though we will never look at the contents of your messages or files nor process them in an automated fashion we strongly advise you to use the <a href="https://conversations.im/omemo/">OMEMO</a> encryption whenever possible.