aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md26
-rw-r--r--client/src/app/login/login.component.html2
-rw-r--r--client/src/sass/bootstrap.scss5
-rw-r--r--support/systemd/peertube.service3
4 files changed, 19 insertions, 17 deletions
diff --git a/README.md b/README.md
index 5ed7d5b4c..db61f8909 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ Be part of a network of multiple small federated, interoperable video hosting pr
35 <img src="https://david-dm.org/Chocobozzz/PeerTube/dev-status.svg?path=client" alt="devDependency Status" /> 35 <img src="https://david-dm.org/Chocobozzz/PeerTube/dev-status.svg?path=client" alt="devDependency Status" />
36 </a> 36 </a>
37 37
38 <a href="https://www.browserstack.com/automate/public-build/cWJhRDFJbS9qeUhzYW04MnlIVjlQQ0x3aE5POXBaV1lycGo5VlQxK3JqZz0tLTNUWW5ySEVvS1N4UnBhYlhsdXVCeVE9PQ==--db09e291d36a582af8b2929d62a625ed660cdf1d"> 38 <a href="https://automate.browserstack.com/public-build/cW5mYW43VDNUR1Jrb0Y5TnVoaC85Tk84SVhzSU9rS0ppWWJJYUVlRzVQRT0tLW9tVGIvK2ZmOGRld3lVVFRYTFM4aEE9PQ==--591b0056e00a2d1cbdfbcfa324634046132008ec">
39 <img src='https://www.browserstack.com/automate/badge.svg?badge_key=cWJhRDFJbS9qeUhzYW04MnlIVjlQQ0x3aE5POXBaV1lycGo5VlQxK3JqZz0tLTNUWW5ySEVvS1N4UnBhYlhsdXVCeVE9PQ==--db09e291d36a582af8b2929d62a625ed660cdf1d'/> 39 <img src="https://automate.browserstack.com/badge.svg?badge_key=cW5mYW43VDNUR1Jrb0Y5TnVoaC85Tk84SVhzSU9rS0ppWWJJYUVlRzVQRT0tLW9tVGIvK2ZmOGRld3lVVFRYTFM4aEE9PQ==--591b0056e00a2d1cbdfbcfa324634046132008ec"/>
40 </a> 40 </a>
41</p> 41</p>
42 42
@@ -73,7 +73,7 @@ Be part of a network of multiple small federated, interoperable video hosting pr
73Introduction 73Introduction
74---------------------------------------------------------------- 74----------------------------------------------------------------
75 75
76PeerTube is a free, decentralized and federated video platform developed as an alternative to other platforms that centralize our data and attention, such as YouTube, Dailymotion or Vimeo. :clapper: But one organization hosting PeerTube alone may not have enough money to pay for bandwidth and video storage of its servers, all servers of PeerTube are interoperable as a federated network, and non-PeerTube servers can be part of the larger Vidiverse (federated video network) by talking our implementation of ActivityPub. Video load is reduced thanks to P2P (BitTorrent) in the web browser via <a href="https://github.com/feross/webtorrent">WebTorrent</a>. 76PeerTube is a free, decentralized and federated video platform developed as an alternative to other platforms that centralize our data and attention, such as YouTube, Dailymotion or Vimeo. :clapper: But one organization hosting PeerTube alone may not have enough money to pay for bandwidth and video storage of its servers, all servers of PeerTube are interoperable as a federated network, and non-PeerTube servers can be part of the larger Vidiverse (federated video network) by talking our implementation of ActivityPub. Video load is reduced thanks to P2P (BitTorrent) in the web browser via <a href="https://github.com/webtorrent/webtorrent">WebTorrent</a>.
77 77
78To learn more, see: 78To learn more, see:
79* This [two-minute video](https://framatube.org/videos/watch/217eefeb-883d-45be-b7fc-a788ad8507d3) (hosted on PeerTube) explaining what PeerTube is and how it works 79* This [two-minute video](https://framatube.org/videos/watch/217eefeb-883d-45be-b7fc-a788ad8507d3) (hosted on PeerTube) explaining what PeerTube is and how it works
@@ -118,7 +118,7 @@ Be it as a user or an instance administrator, you can decide what your experienc
118In addition to visitors using WebTorrent to share the load among them, instances can help each other by caching one another's videos. This way even small instances have a way to show content to a wider audience, as they will be shouldered by friend instances (more about that in our <a href="https://docs.joinpeertube.org/#/contribute-architecture?id=redundancy-between-instances">redundancy guide</a>). 118In addition to visitors using WebTorrent to share the load among them, instances can help each other by caching one another's videos. This way even small instances have a way to show content to a wider audience, as they will be shouldered by friend instances (more about that in our <a href="https://docs.joinpeertube.org/#/contribute-architecture?id=redundancy-between-instances">redundancy guide</a>).
119</p> 119</p>
120<p align="right"> 120<p align="right">
121Content creators can get help from their viewers in the simplest way possible: a support button showing a message linking to their donation accounts or really anything else. No more pay-per-view and advertisements that hurt visitors and <strike>incentivize</strike> alter creativity (more about that in our <a href="./FAQ.md">FAQ</a>). 121Content creators can get help from their viewers in the simplest way possible: a support button showing a message linking to their donation accounts or really anything else. No more pay-per-view and advertisements that hurt visitors and <strike>incentivize</strike> alter creativity (more about that in our <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/FAQ.md">FAQ</a>).
122</p> 122</p>
123 123
124:raised_hands: Contributing 124:raised_hands: Contributing
@@ -127,7 +127,7 @@ Content creators can get help from their viewers in the simplest way possible: a
127You don't need to be a coder to help! 127You don't need to be a coder to help!
128 128
129You can give us your feedback, report bugs, help us translate PeerTube, write documentation, and more. Check out the [contributing 129You can give us your feedback, report bugs, help us translate PeerTube, write documentation, and more. Check out the [contributing
130guide](/.github/CONTRIBUTING.md) to know how, it takes less than 2 minutes to get started. :wink: 130guide](https://github.com/Chocobozzz/PeerTube/blob/develop/.github/CONTRIBUTING.md) to know how, it takes less than 2 minutes to get started. :wink:
131 131
132You can also join the cheerful bunch that makes our community: 132You can also join the cheerful bunch that makes our community:
133 133
@@ -151,14 +151,14 @@ Feel free to reach out if you have any questions or ideas! :speech_balloon:
151 * **yarn >= 1.x** 151 * **yarn >= 1.x**
152 * **FFmpeg >= 3.x** 152 * **FFmpeg >= 3.x**
153 153
154See the [production guide](/support/doc/production.md), which is the recommended way to install or upgrade PeerTube. For hardware requirements, see [Should I have a big server to run PeerTube?](https://github.com/Chocobozzz/PeerTube/blob/develop/FAQ.md#should-i-have-a-big-server-to-run-peertube) in the FAQ. 154See the [production guide](https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/production.md), which is the recommended way to install or upgrade PeerTube. For hardware requirements, see [Should I have a big server to run PeerTube?](https://github.com/Chocobozzz/PeerTube/blob/develop/FAQ.md#should-i-have-a-big-server-to-run-peertube) in the FAQ.
155 155
156See the [community packages](https://docs.joinpeertube.org/#/install-unofficial), which cover various platforms (including [YunoHost](https://install-app.yunohost.org/?app=peertube) and [Docker](/support/doc/docker.md)). 156See the [community packages](https://docs.joinpeertube.org/#/install-unofficial), which cover various platforms (including [YunoHost](https://install-app.yunohost.org/?app=peertube) and [Docker](https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/docker.md)).
157 157
158:book: Documentation 158:book: Documentation
159---------------------------------------------------------------- 159----------------------------------------------------------------
160 160
161If you have a question, please try to find the answer in the [FAQ](/FAQ.md) first. 161If you have a question, please try to find the answer in the [FAQ](https://github.com/Chocobozzz/PeerTube/blob/develop/FAQ.md) first.
162 162
163### User documentation 163### User documentation
164 164
@@ -166,22 +166,22 @@ See the [user documentation](https://docs.joinpeertube.org/#/use-setup-account).
166 166
167### Admin documentation 167### Admin documentation
168 168
169See [how to create your own instance](#package-create-your-own-instance). 169See [how to create your own instance](https://github.com/Chocobozzz/PeerTube/blob/develop/README.md#package-create-your-own-instance).
170 170
171See the more general [admin documentation](https://docs.joinpeertube.org/#/admin-following-instances). 171See the more general [admin documentation](https://docs.joinpeertube.org/#/admin-following-instances).
172 172
173#### Tools 173#### Tools
174 174
175 * [Import videos (YouTube, Dailymotion, Vimeo...)](/support/doc/tools.md) 175 * [Import videos (YouTube, Dailymotion, Vimeo...)](https://github.com/Chocobozzz/PeerTube/blob/develop/support/doc/tools.md)
176 * [Upload videos from the CLI](/support/doc/tools.md) 176 * [Upload videos from the CLI](https://github.com/Chocobozzz/PeerTube/blob/support/doc/tools.md)
177 * [Admin server tools (create transcoding jobs, prune storage...)](/support/doc/tools.md#server-tools) 177 * [Admin server tools (create transcoding jobs, prune storage...)](https://github.com/Chocobozzz/PeerTube/blob/support/doc/tools.md#server-tools)
178 178
179### Technical documentation 179### Technical documentation
180 180
181See the [architecture blueprint](https://docs.joinpeertube.org/#/contribute-architecture) for a more detailed explanation of the architectural choices. 181See the [architecture blueprint](https://docs.joinpeertube.org/#/contribute-architecture) for a more detailed explanation of the architectural choices.
182 182
183See our REST API documentation: 183See our REST API documentation:
184 * OpenAPI 3.0.0 schema: [/support/doc/api/openapi.yaml](/support/doc/api/openapi.yaml) 184 * OpenAPI 3.0.0 schema: [/support/doc/api/openapi.yaml](https://github.com/Chocobozzz/PeerTube/blob/support/doc/api/openapi.yaml)
185 * Spec explorer: [docs.joinpeertube.org/api-rest-reference.html](https://docs.joinpeertube.org/api-rest-reference.html) 185 * Spec explorer: [docs.joinpeertube.org/api-rest-reference.html](https://docs.joinpeertube.org/api-rest-reference.html)
186 186
187See our [ActivityPub documentation](https://docs.joinpeertube.org/#/api-activitypub). 187See our [ActivityPub documentation](https://docs.joinpeertube.org/#/api-activitypub).
diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 3fb1247c8..9bbeab3be 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -19,7 +19,7 @@
19 or create an account 19 or create an account
20 </a> 20 </a>
21 21
22 <a i18n *ngIf="signupAllowed === false" href="https://joinpeertube.org/en/#instances-list" target="_blank" title="Click here to see a list of instances where to register" class="create-an-account"> 22 <a i18n *ngIf="signupAllowed === false" href="https://joinpeertube.org/instances#instances-list" target="_blank" title="Click here to see a list of instances where to register" class="create-an-account">
23 or create an account on another instance 23 or create an account on another instance
24 </a> 24 </a>
25 25
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index 12e73278a..8f1e18d9e 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -125,6 +125,11 @@ ngb-tabset.bootstrap {
125 border-bottom: none; 125 border-bottom: none;
126} 126}
127 127
128.card {
129 background-color: var(--mainBackgroundColor);
130 border-color: #dee2e6;
131}
132
128.collapse-transition { 133.collapse-transition {
129 // Animation when we show/hide the filters 134 // Animation when we show/hide the filters
130 transition: max-height 0.3s; 135 transition: max-height 0.3s;
diff --git a/support/systemd/peertube.service b/support/systemd/peertube.service
index fba644788..cf4e7b417 100644
--- a/support/systemd/peertube.service
+++ b/support/systemd/peertube.service
@@ -16,9 +16,6 @@ SyslogIdentifier=peertube
16Restart=always 16Restart=always
17 17
18; Some security directives. 18; Some security directives.
19; Use private /tmp and /var/tmp folders inside a new file system namespace,
20; which are discarded after the process stops.
21PrivateTmp=true
22; Mount /usr, /boot, and /etc as read-only for processes invoked by this service. 19; Mount /usr, /boot, and /etc as read-only for processes invoked by this service.
23ProtectSystem=full 20ProtectSystem=full
24; Sets up a new /dev mount for the process and only adds API pseudo devices 21; Sets up a new /dev mount for the process and only adds API pseudo devices