Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Video Platforms becomes Video/Audio Platforms + add Funkwhale #2330

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<a class="dropdown-item" href="/providers/search-engines/"><span class="fas fa-search fa-fw"></span> Search Engines</a>
<a class="dropdown-item" href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> Social Networks</a>
<a class="dropdown-item" href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> Social News Aggregators</a>
<a class="dropdown-item" href="/providers/video/"><span class="fas fa-video fa-fw"></span> Video Platforms</a>
<a class="dropdown-item" href="/providers/video-audio/"><span class="fas fa-video fa-fw"></span> Video/Audio Platforms</a>
<a class="dropdown-item" href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> VPN</a>
</span>
</details>
Expand Down
14 changes: 0 additions & 14 deletions _includes/sections/decentralized-video.html

This file was deleted.

27 changes: 27 additions & 0 deletions _includes/sections/video-audio-providers.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<h1 id="video" class="anchor"><a href="#video-audio"><i class="fas fa-link anchor-icon"></i></a> Decentralized Video/Audio Platforms</h1>

<div class="alert alert-warning" role="alert">
<strong> If you are currently using a platform like YouTube, Vimeo or SoundCloud, you should pick an alternative here.</strong>
</div>

<p>Note that content creators can not be anonymous with these platforms since the content is shared from peer-to-peer, directly from the content creator's device to the viewers.</p>

{% include cardv2.html
title="PeerTube"
image="/assets/img/svg/3rd-party/peertube.svg"
image-dark="/assets/img/svg/3rd-party/peertube-dark.svg"
description='PeerTube, developed by Framasoft, is a free and decentralized alternative to video platforms, with over 400,000 videos published by over 50,000 users and viewed over 10 million times. If you are looking for a server to join, you are welcome to join our hosted instance: <a href="https://tube.privacytools.io/">tube.privacytools.io</a>'
website="https://joinpeertube.org"
github="https://github.com/Chocobozzz/PeerTube"
web="https://joinpeertube.org/#what-is-peertube"
%}

{% include cardv2.html
title="Funkwhale"
image="/assets/img/svg/3rd-party/funkwhale.svg"
image-dark="/assets/img/svg/3rd-party/funkwhale-dark.svg"
description='Funkwhale is a decentralized <a href="https://network.funkwhale.audio/dashboards/d/overview/funkwhale-network-overview">federated</a> audio sharing and social platform.'
website="https://funkwhale.audio/"
gitlab="https://dev.funkwhale.audio/funkwhale"
web="https://funkwhale.audio/#get-started"
%}
1 change: 1 addition & 0 deletions _includes/sections/video-frontends.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ <h1 id="proxies" class="anchor"><a href="#proxies"><i class="fas fa-link anchor-
{% include cardv2.html
title="Invidious"
image="/assets/img/svg/3rd-party/invidious.svg"
image-dark="/assets/img/svg/3rd-party/invidious-dark.svg"
description='Invidious is an alternative front-end to YouTube. It is free software, with no advertising or Javascript dependency to play videos, with lots of other features that allow you to have a complete YouTube experience, sans Google.'
labels="color==warning::icon==fas fa-exclamation-triangle::link==https://github.com/iv-org/documentation/blob/master/Always-use-%22local%22-to-proxy-video-through-the-server-without-creating-an-account.md::text==Warning::tooltip==By default, Invidious will not proxy videos through the instance's proxy."
website="https://invidio.us"
Expand Down
19 changes: 19 additions & 0 deletions assets/img/svg/3rd-party/funkwhale-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions assets/img/svg/3rd-party/funkwhale.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions assets/img/svg/3rd-party/invidious-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion assets/img/svg/3rd-party/invidious.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions assets/img/svg/3rd-party/peertube-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion assets/img/svg/3rd-party/peertube.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pages/old.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

{% include sections/social-news-aggregator.html %}

{% include sections/decentralized-video.html %}
{% include sections/video-audio-providers.html %}

{% include sections/video-frontends.html %}

Expand Down
Loading