diff --git a/CREDITS.md b/CREDITS.md index 1b8ef7370..09719974d 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,4 +1,4 @@ -# Code +# Code contributors * [Chocobozzz](https://github.com/Chocobozzz) * [rigelk](https://github.com/rigelk) @@ -8,10 +8,12 @@ * [Jorropo](https://github.com/Jorropo) * [buoyantair](https://github.com/buoyantair) * [bnjbvr](https://github.com/bnjbvr) + * [frankstrater](https://github.com/frankstrater) * [jankeromnes](https://github.com/jankeromnes) * [lucas-dclrcq](https://github.com/lucas-dclrcq) - * [DavidLibeau](https://github.com/DavidLibeau) * [JohnXLivingston](https://github.com/JohnXLivingston) + * [DavidLibeau](https://github.com/DavidLibeau) + * [fflorent](https://github.com/fflorent) * [kaiyou](https://github.com/kaiyou) * [ldidry](https://github.com/ldidry) * [McFlat](https://github.com/McFlat) @@ -21,25 +23,25 @@ * [NassimBounouas](https://github.com/NassimBounouas) * [thomaskuntzz](https://github.com/thomaskuntzz) * [rezonant](https://github.com/rezonant) + * [Wirebrass](https://github.com/Wirebrass) * [clementbrizard](https://github.com/clementbrizard) * [LecygneNoir](https://github.com/LecygneNoir) * [okhin](https://github.com/okhin) * [daftaupe](https://github.com/daftaupe) * [tcitworld](https://github.com/tcitworld) - * [fflorent](https://github.com/fflorent) * [dedesite](https://github.com/dedesite) * [Nautigsam](https://github.com/Nautigsam) * [scanlime](https://github.com/scanlime) * [am97](https://github.com/am97) * [dadall](https://github.com/dadall) * [jonathanraes](https://github.com/jonathanraes) - * [Wirebrass](https://github.com/Wirebrass) * [yohanboniface](https://github.com/yohanboniface) * [anoadragon453](https://github.com/anoadragon453) * [auberanger](https://github.com/auberanger) * [darnuria](https://github.com/darnuria) * [rhaamo](https://github.com/rhaamo) * [mrflos](https://github.com/mrflos) + * [Yetangitu](https://github.com/Yetangitu) * [jocelynj](https://github.com/jocelynj) * [lucaspontoexe](https://github.com/lucaspontoexe) * [flyingrub](https://github.com/flyingrub) @@ -57,6 +59,7 @@ * [Anton-Latukha](https://github.com/Anton-Latukha) * [noplanman](https://github.com/noplanman) * [austinheap](https://github.com/austinheap) + * [BO41](https://github.com/BO41) * [benabbottnz](https://github.com/benabbottnz) * [ewft](https://github.com/ewft) * [bradsk88](https://github.com/bradsk88) @@ -67,7 +70,6 @@ * [ebrehault](https://github.com/ebrehault) * [DatBewar](https://github.com/DatBewar) * [ReK2Fernandez](https://github.com/ReK2Fernandez) - * [Yetangitu](https://github.com/Yetangitu) * [grizio](https://github.com/grizio) * [Glandos](https://github.com/Glandos) * [lanodan](https://github.com/lanodan) @@ -80,6 +82,7 @@ * [pichouk](https://github.com/pichouk) * [LeoMouyna](https://github.com/LeoMouyna) * [LiPeK](https://github.com/LiPeK) + * [Findus23](https://github.com/Findus23) * [zapashcanon](https://github.com/zapashcanon) * [mart-e](https://github.com/mart-e) * [0mp](https://github.com/0mp) @@ -95,6 +98,7 @@ * [quentinDupont](https://github.com/quentinDupont) * [Quenty31](https://github.com/Quenty31) * [sundowndev](https://github.com/sundowndev) + * [robinkooli](https://github.com/robinkooli) * [sesn](https://github.com/sesn) * [ALSai](https://github.com/ALSai) * [Simounet](https://github.com/Simounet) @@ -103,14 +107,13 @@ * [FrozenDroid](https://github.com/FrozenDroid) * [fallen](https://github.com/fallen) * [melongbob](https://github.com/melongbob) - * [Zig-03](https://github.com/Zig-03) * [anmol26s](https://github.com/anmol26s) * [imbsky](https://github.com/imbsky) * [ctlaltdefeat](https://github.com/ctlaltdefeat) * [jomo](https://github.com/jomo) * [libertysoft3](https://github.com/libertysoft3) * [lsde](https://github.com/lsde) - * [memoryboxes](https://github.com/memoryboxes) + * [brain-zhang](https://github.com/brain-zhang) * [norrist](https://github.com/norrist) * [osauzet](https://github.com/osauzet) * [SansPseudoFix](https://github.com/SansPseudoFix) @@ -121,7 +124,7 @@ * [ewasion](https://github.com/ewasion) -# Translations +# Translation contributors * [abdhessuk](https://trad.framasoft.org/zanata/profile/view/abdhessuk) * [abidin24](https://trad.framasoft.org/zanata/profile/view/abidin24) @@ -196,6 +199,7 @@ * [abidin24](https://trad.framasoft.org/zanata/profile/view/abidin24) * [aditoo](https://trad.framasoft.org/zanata/profile/view/aditoo) * [alidemirtas](https://trad.framasoft.org/zanata/profile/view/alidemirtas) + * [anastasia](https://trad.framasoft.org/zanata/profile/view/anastasia) * [ariasuni](https://trad.framasoft.org/zanata/profile/view/ariasuni) * [autom](https://trad.framasoft.org/zanata/profile/view/autom) * [balaji](https://trad.framasoft.org/zanata/profile/view/balaji) @@ -203,13 +207,16 @@ * [bristow](https://trad.framasoft.org/zanata/profile/view/bristow) * [butterflyoffire](https://trad.framasoft.org/zanata/profile/view/butterflyoffire) * [c0dr](https://trad.framasoft.org/zanata/profile/view/c0dr) + * [canony](https://trad.framasoft.org/zanata/profile/view/canony) * [cat](https://trad.framasoft.org/zanata/profile/view/cat) * [chocobozzz](https://trad.framasoft.org/zanata/profile/view/chocobozzz) * [clerie](https://trad.framasoft.org/zanata/profile/view/clerie) * [curupira](https://trad.framasoft.org/zanata/profile/view/curupira) * [dhsets](https://trad.framasoft.org/zanata/profile/view/dhsets) + * [dibek](https://trad.framasoft.org/zanata/profile/view/dibek) * [digitalkiller](https://trad.framasoft.org/zanata/profile/view/digitalkiller) * [dwsage](https://trad.framasoft.org/zanata/profile/view/dwsage) + * [fkohrt](https://trad.framasoft.org/zanata/profile/view/fkohrt) * [flauta](https://trad.framasoft.org/zanata/profile/view/flauta) * [frankstrater](https://trad.framasoft.org/zanata/profile/view/frankstrater) * [gillux](https://trad.framasoft.org/zanata/profile/view/gillux) @@ -220,17 +227,25 @@ * [jhertel](https://trad.framasoft.org/zanata/profile/view/jhertel) * [joss2lyon](https://trad.framasoft.org/zanata/profile/view/joss2lyon) * [kekkotranslates](https://trad.framasoft.org/zanata/profile/view/kekkotranslates) + * [kingu](https://trad.framasoft.org/zanata/profile/view/kingu) * [kittybecca](https://trad.framasoft.org/zanata/profile/view/kittybecca) + * [kousha](https://trad.framasoft.org/zanata/profile/view/kousha) * [krkk](https://trad.framasoft.org/zanata/profile/view/krkk) + * [lapor](https://trad.framasoft.org/zanata/profile/view/lapor) * [laufor](https://trad.framasoft.org/zanata/profile/view/laufor) * [leeroyepold48](https://trad.framasoft.org/zanata/profile/view/leeroyepold48) * [lstamellos](https://trad.framasoft.org/zanata/profile/view/lstamellos) * [mablr](https://trad.framasoft.org/zanata/profile/view/mablr) * [marcinmalecki](https://trad.framasoft.org/zanata/profile/view/marcinmalecki) * [matograine](https://trad.framasoft.org/zanata/profile/view/matograine) + * [mayana](https://trad.framasoft.org/zanata/profile/view/mayana) * [mikeorlov](https://trad.framasoft.org/zanata/profile/view/mikeorlov) * [nin](https://trad.framasoft.org/zanata/profile/view/nin) + * [noncommutativegeo](https://trad.framasoft.org/zanata/profile/view/noncommutativegeo) * [norbipeti](https://trad.framasoft.org/zanata/profile/view/norbipeti) + * [nvivant](https://trad.framasoft.org/zanata/profile/view/nvivant) + * [osoitz](https://trad.framasoft.org/zanata/profile/view/osoitz) + * [ppnplus](https://trad.framasoft.org/zanata/profile/view/ppnplus) * [predatorix](https://trad.framasoft.org/zanata/profile/view/predatorix) * [quentin](https://trad.framasoft.org/zanata/profile/view/quentin) * [quentind](https://trad.framasoft.org/zanata/profile/view/quentind) @@ -238,11 +253,14 @@ * [robin](https://trad.framasoft.org/zanata/profile/view/robin) * [rond](https://trad.framasoft.org/zanata/profile/view/rond) * [s8321414](https://trad.framasoft.org/zanata/profile/view/s8321414) + * [sato_ss](https://trad.framasoft.org/zanata/profile/view/sato_ss) * [secreet](https://trad.framasoft.org/zanata/profile/view/secreet) + * [sercom_kc](https://trad.framasoft.org/zanata/profile/view/sercom_kc) * [severo](https://trad.framasoft.org/zanata/profile/view/severo) * [silkevicious](https://trad.framasoft.org/zanata/profile/view/silkevicious) * [sporiff](https://trad.framasoft.org/zanata/profile/view/sporiff) * [tekuteku](https://trad.framasoft.org/zanata/profile/view/tekuteku) + * [thecatjustmeow](https://trad.framasoft.org/zanata/profile/view/thecatjustmeow) * [tirifto](https://trad.framasoft.org/zanata/profile/view/tirifto) * [tmota](https://trad.framasoft.org/zanata/profile/view/tmota) * [tuxayo](https://trad.framasoft.org/zanata/profile/view/tuxayo) diff --git a/README.md b/README.md index 4a785478c..5ed7d5b4c 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Be part of a network of multiple small federated, interoperable video hosting pr
diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html index 9499bbe4e..25d416740 100644 --- a/client/src/app/+about/about-instance/about-instance.component.html +++ b/client/src/app/+about/about-instance/about-instance.component.html @@ -4,7 +4,7 @@{{ businessModel }}
+ Developed with ❤ by Framasoft +
+ ++ + + +
+ + diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss b/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss new file mode 100644 index 000000000..9c3b0a46b --- /dev/null +++ b/client/src/app/+about/about-peertube/about-peertube-contributors.component.scss @@ -0,0 +1,15 @@ +@import '_variables'; +@import '_mixins'; + +/deep/ h1 { + font-size: 1rem; +} + +/deep/ ul { + padding: 0; + + li { + display: inline-block; + margin-right: 10px; + } +} diff --git a/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts b/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts new file mode 100644 index 000000000..fa2c0daa0 --- /dev/null +++ b/client/src/app/+about/about-peertube/about-peertube-contributors.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core' +import { MarkdownService } from '@app/shared/renderer' + +@Component({ + selector: 'my-about-peertube-contributors', + templateUrl: './about-peertube-contributors.component.html', + styleUrls: [ './about-peertube-contributors.component.scss' ] +}) +export class AboutPeertubeContributorsComponent implements OnInit { + creditsHtml: string + + private markdown = require('raw-loader!../../../../../CREDITS.md') + + constructor (private markdownService: MarkdownService) { } + + async ngOnInit () { + this.creditsHtml = await this.markdownService.completeMarkdownToHTML(this.markdown) + } +} diff --git a/client/src/app/+about/about-peertube/about-peertube.component.html b/client/src/app/+about/about-peertube/about-peertube.component.html index d3fc9a828..423f7bce7 100644 --- a/client/src/app/+about/about-peertube/about-peertube.component.html +++ b/client/src/app/+about/about-peertube/about-peertube.component.html @@ -14,84 +14,89 @@ -- PeerTube uses the BitTorrent protocol to share bandwidth between users. - This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video. -
++ PeerTube uses the BitTorrent protocol to share bandwidth between users. + This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video. +
-- In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video. - In practice, this is much more difficult because: -
++ In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video. + In practice, this is much more difficult because: +
-- The worst-case scenario of an average person spying on their friends is quite unlikely. - There are much more effective ways to get that kind of information. -
++ The worst-case scenario of an average person spying on their friends is quite unlikely. + There are much more effective ways to get that kind of information. +
-- The threats to privacy in YouTube are different from PeerTube's. - In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you. - Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics). -
++ The threats to privacy in YouTube are different from PeerTube's. + In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you. + Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics). +
-- Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing your IP in their connection logs: ISP/routers/trackers/CDN and more. - PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser. - Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense. -
++ Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing your IP in their connection logs: ISP/routers/trackers/CDN and more. + PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser. + Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense. +
-- PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. - In the meantime, we want to test different ideas related to this issue: -
++ PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released. + In the meantime, we want to test different ideas related to this issue: +
+ +