From c6037330a091100e8832fc0569f4373d17e81e6b Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sat, 14 Sep 2019 10:57:08 -0700
Subject: [PATCH 1/8] Convert File Sync to cardv2
---
_includes/sections/file-sync.html | 44 ++++++++++++++++++++-----------
1 file changed, 28 insertions(+), 16 deletions(-)
diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html
index e7a8fd77..127383de 100644
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@@ -1,24 +1,36 @@
- Secure File Sync Software
+
+
+
+
+ Secure File Sync Software
+
-
-
- {% include card.html color="success"
+{%
+ include cardv2.html
title="SparkleShare"
image="/assets/img/tools/SparkleShare.png"
- url="https://sparkleshare.org/"
- footer="OS: Windows, macOS, Linux."
- description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically
- kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
- %} {% include card.html color="primary"
+ description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
+ website="https://sparkleshare.org/"
+ forum=""
+ github="https://github.com/hbons/SparkleShare"
+ linux="https://www.sparkleshare.org/"
+ mac="https://github.com/hbons/SparkleShare/releases/"
+%}
+
+{%
+ include cardv2.html
title="Syncthing"
image="/assets/img/tools/Syncthing.png"
- url="https://syncthing.net/"
- footer="OS: Windows, macOS, Linux, Android, BSD, Solaris."
- description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to
- choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
- %}
-
-
+ description="SyncThing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
+ website="https://syncthing.net/"
+ forum=""
+ github="https://github.com/syncthing?type=source"
+ windows="https://github.com/syncthing/syncthing-gtk/releases/latest"
+ linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
+ mac="https://github.com/syncthing/syncthing-macos/releases/latest"
+ fdroid="https://f-droid.org/packages/com.nutomic.syncthingandroid/"
+ googleplay="https://play.google.com/store/apps/details?id=com.nutomic.syncthingandroid"
+%}
Worth Mentioning
--
2.47.2
From 71875fb01a0497c32dda854edaac5e957870c3dc Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sat, 14 Sep 2019 10:58:50 -0700
Subject: [PATCH 2/8] Update source_code.md
---
source_code.md | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/source_code.md b/source_code.md
index 8f84fb76..ebb929e7 100644
--- a/source_code.md
+++ b/source_code.md
@@ -185,13 +185,14 @@ Magic Wormhole: https://github.com/warner/magic-wormhole
[WIP]
## Secure File Sync Software
- SparkleShare: https://www.github.com/hbons/SparkleShare/
- Syncthing: https://github.com/syncthing/syncthing
+SparkleShare: https://www.github.com/hbons/SparkleShare/
- Worth Mentioning
-.
- git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary
+Syncthing: https://github.com/syncthing/syncthing
+
+### Worth Mentioning
+
+- git-annex: http://source.git-annex.branchable.com/?p=source.git;a=summary
## Password Manager Software
--
2.47.2
From 28707b73dfe94a792d24b0b0a2e3185a77da791c Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sat, 14 Sep 2019 11:03:27 -0700
Subject: [PATCH 3/8] Update titles for consistency
---
_includes/nav.html | 2 +-
_includes/sections/file-sync.html | 2 +-
pages/software/file-sync.html | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/_includes/nav.html b/_includes/nav.html
index 62f3b263..f3d26db6 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -68,10 +68,10 @@
Email Clients
File Encryption
File Sharing
+ File Sync
Password Manager
Productivity Tools
Real-Time Communication
- Secure File Sync
Self-contained Networks
Self-Hosted Cloud Server
diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html
index 127383de..321d0f74 100644
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@@ -2,7 +2,7 @@
- Secure File Sync Software
+ File Sync
{%
diff --git a/pages/software/file-sync.html b/pages/software/file-sync.html
index 61d260aa..29702b93 100644
--- a/pages/software/file-sync.html
+++ b/pages/software/file-sync.html
@@ -1,7 +1,7 @@
---
layout: page
permalink: /software/file-sync/
-title: "File Sync Tools"
+title: "File Sync"
description: "Discover free, open source, and secure ways to sync your files across your devices."
---
--
2.47.2
From d9fff06f41d074a07b054f5b18e71cf97a9576a2 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sat, 14 Sep 2019 11:39:08 -0700
Subject: [PATCH 4/8] Add forum links
---
_includes/sections/file-sync.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html
index 321d0f74..19dbaedd 100644
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@@ -11,7 +11,7 @@
image="/assets/img/tools/SparkleShare.png"
description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file."
website="https://sparkleshare.org/"
- forum=""
+ forum="https://forum.privacytools.io/t/discussion-sparkleshare/1626"
github="https://github.com/hbons/SparkleShare"
linux="https://www.sparkleshare.org/"
mac="https://github.com/hbons/SparkleShare/releases/"
@@ -23,7 +23,7 @@
image="/assets/img/tools/Syncthing.png"
description="SyncThing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
website="https://syncthing.net/"
- forum=""
+ forum="https://forum.privacytools.io/t/discussion-syncthing/1627/2"
github="https://github.com/syncthing?type=source"
windows="https://github.com/syncthing/syncthing-gtk/releases/latest"
linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
--
2.47.2
From 6d50eca9221e21539ad5fbe5d9ac1a67cd584e8b Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sun, 15 Sep 2019 15:14:50 -0700
Subject: [PATCH 5/8] Update Syncthing F-Droid link to fork
---
_includes/sections/file-sync.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html
index 19dbaedd..71cec475 100644
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@@ -28,7 +28,7 @@
windows="https://github.com/syncthing/syncthing-gtk/releases/latest"
linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
mac="https://github.com/syncthing/syncthing-macos/releases/latest"
- fdroid="https://f-droid.org/packages/com.nutomic.syncthingandroid/"
+ fdroid="https://f-droid.org/packages/com.github.catfriend1.syncthingandroid/"
googleplay="https://play.google.com/store/apps/details?id=com.nutomic.syncthingandroid"
%}
--
2.47.2
From 51c25b9a73624efa091d65bf758bef69bc847d3b Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sun, 15 Sep 2019 15:21:25 -0700
Subject: [PATCH 6/8] Update Syncthing Google Play link to fork
---
_includes/sections/file-sync.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html
index 71cec475..339753ca 100644
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@@ -29,7 +29,7 @@
linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
mac="https://github.com/syncthing/syncthing-macos/releases/latest"
fdroid="https://f-droid.org/packages/com.github.catfriend1.syncthingandroid/"
- googleplay="https://play.google.com/store/apps/details?id=com.nutomic.syncthingandroid"
+ googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
%}
Worth Mentioning
--
2.47.2
From f9004e336ceca3878da9d09016f2c2944e2db5d7 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sun, 15 Sep 2019 15:26:43 -0700
Subject: [PATCH 7/8] Update SparkleShare source code link
---
source_code.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source_code.md b/source_code.md
index ebb929e7..ba1495ec 100644
--- a/source_code.md
+++ b/source_code.md
@@ -186,7 +186,7 @@ Magic Wormhole: https://github.com/warner/magic-wormhole
## Secure File Sync Software
-SparkleShare: https://www.github.com/hbons/SparkleShare/
+SparkleShare: https://github.com/hbons/SparkleShare/
Syncthing: https://github.com/syncthing/syncthing
--
2.47.2
From 7597093e8b73751d5758e0f4cde88ea17b18c818 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Tue, 17 Sep 2019 23:19:21 -0700
Subject: [PATCH 8/8] Move Syncthing above SparkleShare
---
_includes/sections/file-sync.html | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html
index 339753ca..6dea5561 100644
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@@ -5,6 +5,21 @@
File Sync
+{%
+ include cardv2.html
+ title="Syncthing"
+ image="/assets/img/tools/Syncthing.png"
+ description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
+ website="https://syncthing.net/"
+ forum="https://forum.privacytools.io/t/discussion-syncthing/1627/2"
+ github="https://github.com/syncthing?type=source"
+ windows="https://github.com/syncthing/syncthing-gtk/releases/latest"
+ linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
+ mac="https://github.com/syncthing/syncthing-macos/releases/latest"
+ fdroid="https://f-droid.org/packages/com.github.catfriend1.syncthingandroid/"
+ googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
+%}
+
{%
include cardv2.html
title="SparkleShare"
@@ -17,21 +32,6 @@
mac="https://github.com/hbons/SparkleShare/releases/"
%}
-{%
- include cardv2.html
- title="Syncthing"
- image="/assets/img/tools/Syncthing.png"
- description="SyncThing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet."
- website="https://syncthing.net/"
- forum="https://forum.privacytools.io/t/discussion-syncthing/1627/2"
- github="https://github.com/syncthing?type=source"
- windows="https://github.com/syncthing/syncthing-gtk/releases/latest"
- linux="https://github.com/syncthing/syncthing-gtk/releases/latest"
- mac="https://github.com/syncthing/syncthing-macos/releases/latest"
- fdroid="https://f-droid.org/packages/com.github.catfriend1.syncthingandroid/"
- googleplay="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid"
-%}
-
Worth Mentioning