privacyguides/privacytools.io
Archived
1
0
Fork 0
Code Issues 304 Pull Requests 47 Activity

Merge im, teamchat and video-voice into real-time-communication #1136

Merged
Mikaela merged 8 commits from real-time-communication into master 2019-08-12 03:18:19 +00:00
Conversation 11 Commits 8 Files Changed 6 +18 -27
6 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dc77667b4e - Show all commits

1
_config.yml
View File

@@ -5,6 +5,7 @@ sass:
style: compressed
plugins:
- jekyll-sitemap
- jekyll-redirect-from
Mikaela commented 2019-08-11 16:20:41 +00:00 (Migrated from github.com)
Review
Copy Link

I think @JonahAragon said that he would do this with nginx which is more elegant, but I guess it won't hurt being here too as Nginx is going to take a preference and in case nginx got forgotten, the user wouldn't see that much of a difference.

I think @JonahAragon said that he would do this with nginx which is more elegant, but I guess it won't hurt being here too as Nginx is going to take a preference and in case nginx got forgotten, the user wouldn't see that much of a difference.
sitemap:
file: "/sitemap.xml"
include: [".well-known"]

4
_includes/nav.html
View File

@@ -49,14 +49,12 @@
<a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> Email Clients</a>
<a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</a>
<a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</a>
<a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane fa-fw"></i> Instant Messenger</a>
<a class="dropdown-item" href="/software/teamchat/"><i class="fas fa-users fa-fw"></i> Team chat</a>
<a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</a>
<a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</a>
<a class="dropdown-item" href="/software/real-time-communication/"><i class="fas fa-telegram-plane"></i> Real time communication</a>
<a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>
<a class="dropdown-item" href="/software/networks/"><i class="fas fa-user-secret fa-fw"></i> Self-contained Networks</a>
<a class="dropdown-item" href="/software/cloud/"><i class="fas fa-hdd fa-fw"></i> Self-Hosted Cloud Server</a>
<a class="dropdown-item" href="/software/voip/"><i class="fas fa-phone fa-fw"></i> Video & Voice Messenger</a>
</div>
</li>
<li class="nav-item dropdown">

8
pages/software/im.html
View File

@@ -1,8 +0,0 @@
---
layout: page
permalink: /software/im/
title: "Instant Messaging"
description: "Discover secure and private ways to message others online without letting any third parties read your messages."
---
{% include sections/instant-messenger.html %}

16
pages/software/real-time-communication.html Normal file
View File

@@ -0,0 +1,16 @@
---
layout: page
permalink: /software/real-time-communication/
redirect_from:
- /software/im/
- /software/voip/
- /software/teamchat/
title: "Real time communication"
Discover secure and private ways to communicate with others online without letting any third parties read your messages.
Mikaela commented 2019-08-11 16:21:21 +00:00 (Migrated from github.com)
Review
Copy Link

I thought that this was the best applying description to them all together.

I thought that this was the best applying description to them all together.
nitrohorse commented 2019-08-11 16:24:27 +00:00 (Migrated from github.com)
Review
Copy Link

That sounds good to me.

That sounds good to me.
---
{% include sections/instant-messenger.html %}
{% include sections/voice-video-messenger.html %}
Mikaela commented 2019-08-11 16:21:38 +00:00 (Migrated from github.com)
Review
Copy Link

I wish to have some separator between the different sections, even if they are on the same page.

I wish to have some separator between the different sections, even if they are on the same page.
Mikaela commented 2019-08-11 16:22:42 +00:00 (Migrated from github.com)
Review
Copy Link

And I think this ordering makes the most sense as I think people are most often looking for instant messengers, then VoIP and team chat is a bit rarer scenario as I think that is mostly forced on people from whichever the team founder prefers.

And I think this ordering makes the most sense as I think people are most often looking for instant messengers, then VoIP and team chat is a bit rarer scenario as I think that is mostly forced on people from whichever the team founder prefers.
nitrohorse commented 2019-08-11 16:26:28 +00:00 (Migrated from github.com)
Review
Copy Link

Yeah the breaks work well in my perspective.

Yeah the breaks work well in my perspective.
{% include sections/teamchat.html %}

8
pages/software/teamchat.html
View File

@@ -1,8 +0,0 @@
---
layout: page
permalink: /software/teamchat/
title: "Team chat"
description: "Discover secure and private ways to communicate with your team online without letting any third parties read your messages."
---
{% include sections/teamchat.html %}

8
pages/software/video-voice.html
View File

@@ -1,8 +0,0 @@
---
layout: page
permalink: /software/voip/
title: "VoIP"
description: "Find a voice and video messenger that supports completely End-to-End encrypted calls."
---
{% include sections/voice-video-messenger.html %}