Commit graph

182 commits

Author SHA1 Message Date
Pierre-Yves Gosset
1f43b93e50 Revert "YOLO!"
This reverts commit add4bb595a
2019-03-28 16:20:24 +01:00
Pierre-Yves Gosset
1ae4ba5118 YOLOBIS! 2019-03-28 16:17:37 +01:00
Pierre-Yves Gosset
add4bb595a YOLO! 2019-03-28 16:16:40 +01:00
Pierre-Yves Gosset
70f6791ebd correction de la formation 2019-03-28 16:12:07 +01:00
Pierre-Yves Gosset
539d564a3a Merge branch 'master' into 'master'
Update fr.yml test pouhiou newsletter 4

See merge request framasoft/peertube/joinpeertube!56
2019-03-28 15:19:54 +01:00
Pouhiou
0f693565a9 Update fr.yml test pouhiou newsletter 4 2019-03-28 14:56:08 +01:00
Chocobozzz
870bbc6ebd Merge branch 'master' into 'master'
update translations

See merge request framasoft/peertube/joinpeertube!54
2019-03-26 15:53:57 +01:00
Chocobozzz
8c98f264b6
update translations 2019-03-26 15:42:17 +01:00
Thomas Citharel
f5a1db6746
Change the "banner" aside section to link to the latest NL
Also fix alignment with pic

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-03-18 18:39:17 +01:00
Thomas Citharel
25b15b320e Merge branch 'master' into 'master'
Add news section

See merge request framasoft/peertube/joinpeertube!53
2019-03-18 15:37:01 +01:00
Thomas Citharel
7851586d8f Add news section
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-03-18 15:37:01 +01:00
Chocobozzz
e05bef2a6a Merge branch 'feature/update-translation' into 'master'
Add albanian language

See merge request framasoft/peertube/joinpeertube!51
2019-02-22 14:13:59 +01:00
Chocobozzz
d3a0119795
Add albanian language 2019-02-22 14:11:47 +01:00
Chocobozzz
a51f63f8ea Merge branch 'feature/remove-2018' into 'master'
Remove 2018 reference in FAQ

See merge request framasoft/peertube/joinpeertube!50
2019-02-18 14:16:24 +01:00
Chocobozzz
15a255a822
Remove 2018 reference in FAQ 2019-02-18 14:10:02 +01:00
Chocobozzz
ef63ecabfe Merge branch 'feature/update-video' into 'master'
Update what is peertube video

See merge request framasoft/peertube/joinpeertube!49
2019-02-14 15:07:56 +01:00
Chocobozzz
59238349b9
Update what is peertube video
Use the one that does not have forced subtitles
2019-02-14 14:27:37 +01:00
Chocobozzz
e3e8dbdf48 Merge branch 'feature/locales' into 'master'
Update locales

See merge request framasoft/peertube/joinpeertube!47
2019-02-12 09:53:35 +01:00
Chocobozzz
a5c5778d55
Fix zanata config init 2019-02-08 14:21:12 +01:00
Chocobozzz
30963bc89a Merge branch 'feature/filter-nsfw-instances' into 'master'
Hide instances displaying nsfw from reg table

See merge request framasoft/peertube/joinpeertube!48
2019-02-08 14:12:44 +01:00
Chocobozzz
7f684a4e0f
Hide instances displaying nsfw from reg table 2019-02-08 14:10:23 +01:00
Chocobozzz
0fe3fca6ee
Update locales 2019-02-08 10:23:11 +01:00
Chocobozzz
852e1ba317 Merge branch 'master' into 'master'
Fix error display

See merge request framasoft/peertube/joinpeertube!46
2019-02-07 15:54:51 +01:00
Chocobozzz
7582538337
Fix error display 2019-02-07 15:36:16 +01:00
Chocobozzz
c25c3d65d2 Merge branch 'master' into 'master'
Optimized images

See merge request framasoft/peertube/joinpeertube!45
2019-02-06 13:44:31 +01:00
JosephK
fad6af439d Optimized images 2019-02-06 13:24:31 +01:00
JosephK
d9986df058 Merge branch 'master' into 'master'
Fix duplicate text + Upgrade deps

See merge request framasoft/peertube/joinpeertube!44
2019-02-06 13:23:44 +01:00
JosephK
28f769495b Upgrade deps 2019-02-06 13:08:03 +01:00
JosephK
4a0355b7bb [faq] Fix duplicate text 2019-02-06 11:34:10 +01:00
JosephK
2e38b5b77e Merge branch 'master' of https://framagit.org/framasoft/peertube/joinpeertube 2019-02-06 11:24:48 +01:00
Chocobozzz
08f25f2cdf Merge branch 'master' into 'master'
Vue for instances list

See merge request framasoft/peertube/joinpeertube!43
2018-11-22 09:27:16 +01:00
Chocobozzz
6164826223
Fix matomo 2018-11-20 11:04:29 +01:00
Chocobozzz
3e974c23eb
Fix english in header 2018-11-20 10:24:04 +01:00
Chocobozzz
a026bad552
Vue for instances list
So we can remove jquery and translate instance info \o/
2018-11-19 17:14:39 +01:00
Thomas Citharel
9ba7fb4070 Merge branch 'patch-3' into 'master'
Update fr.yml

See merge request framasoft/peertube/joinpeertube!42
2018-10-31 12:10:52 +01:00
Thomas Kuntz
d550dddf28 Update fr.yml 2018-10-31 12:08:57 +01:00
Thomas Citharel
22999501f1 Merge branch 'patch-2' into 'master'
Fix typo in French FAQ

See merge request framasoft/peertube/joinpeertube!41
2018-10-31 12:06:05 +01:00
Thomas Kuntz
5f73c2c5d9 Fix typo in French FAQ 2018-10-31 12:04:55 +01:00
Thomas Citharel
79a81920fe Merge branch 'patch-2' into 'master'
Fix bug on fallback typeface

See merge request framasoft/peertube/joinpeertube!40
2018-10-31 11:08:37 +01:00
Thomas Kuntz
11be3389db Fix bug on fallback typeface 2018-10-31 10:59:29 +01:00
Chocobozzz
571a5fb245 Merge branch 'feature/typo' into 'master'
Fix typo

See merge request framasoft/peertube/joinpeertube!39
2018-10-17 17:02:30 +02:00
Chocobozzz
d65f4f176a
Fix typo 2018-10-17 17:01:11 +02:00
Thomas Citharel
682f803a4a Merge branch 'feature/faq-porn' into 'master'
Add porn entry in FAQ

See merge request framasoft/peertube/joinpeertube!38
2018-10-17 16:56:54 +02:00
Chocobozzz
b05f07aec3
Add porn entry in FAQ 2018-10-17 16:55:18 +02:00
Thomas Citharel
eb7f69747e Ajout du lien de blog anglais sur la release
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-10-17 13:45:10 +02:00
Thomas Citharel
9be5b49d29 Add an install PeerTube button
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-10-16 13:04:54 +02:00
Thomas Citharel
7a671cef88 Merge branch 'peertube-release' into 'master'
Ajout de la sortie de la version 1 de PeerTube et lien vers Frama

See merge request framasoft/peertube/joinpeertube!35
2018-10-15 18:24:18 +02:00
Thomas Citharel
4cf1ddbc57 Add blog link to release
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-10-15 18:23:06 +02:00
Rigel Kent
b7a2e7a8fe embed only videos presenting PeerTube 2018-10-15 18:18:52 +02:00
Thomas Citharel
994160e2b8 Remove video on top right
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-10-15 18:18:52 +02:00