+ + {% include services/header.html %} + + {% include services/search.html %} + + {% include services/social-networks.html %} + + {% include services/participate.html %} + + {% include services/footer.html %} + + -- 2.47.2 From 65843365df6537cf8df3c853128edbf9d7adad92 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 29 Mar 2019 13:51:10 -0500 Subject: [PATCH 2/3] Add Social Details --- _includes/services/social-networks.html | 48 ------------------------- _includes/services/social.html | 34 ++++++++++++++++++ services.html | 2 +- 3 files changed, 35 insertions(+), 49 deletions(-) delete mode 100644 _includes/services/social-networks.html create mode 100644 _includes/services/social.html diff --git a/_includes/services/social-networks.html b/_includes/services/social-networks.html deleted file mode 100644 index 93415e3c..00000000 --- a/_includes/services/social-networks.html +++ /dev/null @@ -1,48 +0,0 @@ -

Social Networking

- - - -
- - {% include card.html color="success" - title="Social" - image="assets/img/tools/Mastodon.png" - url="https://social.privacytools.io/" - website="social.privacytools.io" - description='We are now operating an open, federated Mastodon instance to anyone looking to get away from the .' - %} - - {% include card.html color="info" - title="diaspora*" - image="assets/img/tools/diaspora.png" - url="https://diasporafoundation.org/" - description="diaspora* is based on three key philosophies: Decentralization, freedom and privacy. It is intended to address privacy concerns related to centralized social - networks by allowing users set up their own server (or \"pod\") to host content; pods can then interact to share status updates, photographs, and other social data." - %} - - {% include card.html color="info" - title="Friendica" - image="assets/img/tools/Friendica.png" - url="https://friendi.ca/" - description="Friendica has an emphasis on extensive privacy settings and easy server installation. It aims to federate with as many other social networks as possible. Currently, - Friendica users can integrate contacts from Facebook, Twitter, Diaspora, GNU social, App.net, Pump.io and other services in their social streams." - %} - -
- -

Worth Mentioning

- -
    -
  • GNU Social - An open sourced, free and decentralized social network compatible with Mastodon and Friendica.
    • -
- -

Related Information

- - diff --git a/_includes/services/social.html b/_includes/services/social.html new file mode 100644 index 00000000..2b3e2d73 --- /dev/null +++ b/_includes/services/social.html @@ -0,0 +1,34 @@ +

Social

+ + + +
+ + {% include card.html color="success" + title="Social" + image="assets/img/tools/Mastodon.png" + url="https://social.privacytools.io/" + website="social.privacytools.io" + description='We are now operating an open, federated Mastodon instance to anyone looking to get away from Twitter or Facebook for their social networking needs. Our instance is + completely free of advertising and third party trackers.' + %} + + {% include card.html color="info" + title="Video" + image="assets/img/tools/peertube.png" + url="https://video.privacytools.io/" + description="Video content creators are welcome to host their content on our PeerTube platform! PeerTube is a federated video sharing site, so your videos will be accessible from + any other instance regardless of their install." + %} + + {% include card.html color="info" + title="Messaging" + image="assets/img/tools/riot.png" + url="https://chat.privacytools.io/" + description="If you're looking for a messaging solution for yourself or your organization, look no further. We are now offering a free-to-use Matrix/Riot installation featuring + end-to-end encrypted chats, group chats, and everything else the Matrix federated ecosystem has to offer." + %} + +
diff --git a/services.html b/services.html index 37b499cd..ac63bd9f 100644 --- a/services.html +++ b/services.html @@ -8,7 +8,7 @@ active_page: services {% include services/search.html %} - {% include services/social-networks.html %} + {% include services/social.html %} {% include services/participate.html %} -- 2.47.2 From 5d6ccb03ab1425c8ae6eefebf18486bdf4cf95d9 Mon Sep 17 00:00:00 2001 From: BurungHantu1605 Date: Sun, 31 Mar 2019 07:31:34 +0800 Subject: [PATCH 3/3] #714 --- _includes/sections/productivity-tools.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html index f9f4fc6b..73f2dde5 100644 --- a/_includes/sections/productivity-tools.html +++ b/_includes/sections/productivity-tools.html @@ -15,9 +15,9 @@ {% include card.html color="primary" title="Etherpad" image="assets/img/tools/Etherpad.png" - url="http://etherpad.org/" + url="https://etherpad.org/" footer="OS: Windows, macOS, Linux." - description="Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc." + description="Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc. Sites That Run Etherpad" %} {% include card.html color="warning" -- 2.47.2