Commit graph

303 commits

Author SHA1 Message Date
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
Thomas Citharel
11a53f2881 Ajout de la sortie de la version 1 de PeerTube et lien vers Frama
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-10-15 18:18:52 +02:00
Thomas Citharel
269d1908eb Merge branch 'add-faq' into 'master'
Add faq

See merge request framasoft/peertube/joinpeertube!37
2018-10-15 18:15:41 +02:00
Thomas Citharel
c557603121 Add faq 2018-10-15 18:15:41 +02:00
Thomas Citharel
28dc541b85 Merge branch 'fix-dead-link-on-register' into 'master'
Correction d'un lien mort sur depuis la FAQ vers la liste des instances

See merge request framasoft/peertube/joinpeertube!34
2018-10-11 18:11:23 +02:00
Thomas Citharel
fff972da36 Correction d'un lien mort sur depuis la FAQ vers la liste des instances
où l'on peut s'enregistrer

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-10-11 17:18:47 +02:00
Chocobozzz
1a37c827af Merge branch 'master' into 'master'
Optimize PNG files and fix some links

See merge request framasoft/peertube/joinpeertube!33
2018-09-26 10:40:41 +02:00
Chocobozzz
50327f5bce
Fix production doc link 2018-09-26 10:09:41 +02:00
Chocobozzz
7b6ec8299a
Fix favicon url 2018-09-26 10:06:31 +02:00
Chocobozzz
3aa439e441
Optimize png files 2018-09-26 10:06:24 +02:00
JosephK
011db0b933 Update yml2po.sh 2018-09-25 13:35:45 +02:00
JosephK
27431fe56d Ci Deploy 2018-09-25 13:19:17 +02:00
JosephK
253db8af59 CI deploy 2018-09-25 13:15:48 +02:00
JosephK
24bf0d758b Merge branch 'master' into 'master'
Vujisation

See merge request framasoft/peertube/joinpeertube!32
2018-09-25 12:59:35 +02:00
JosephK
2199da3c0e Zanata doesn’t like emoji 2018-09-25 12:54:01 +02:00
JosephK
28696f8090 Vujisation 2018-09-21 23:00:42 +02:00
Luc Didry
41be99a027
[i18N] Add eo, pl, sv and zh-Hant-TW translations 2018-09-20 17:42:29 +02:00
Luc Didry
987b88439f Merge branch 'documentation' into 'master'
switching PeerTube documentation to new site

See merge request framasoft/peertube/joinpeertube!31
2018-09-20 15:08:22 +02:00
Rigel Kent
8690a87e97
switching PeerTube documentation to new site 2018-09-20 14:54:09 +02:00
JosephK
49e85475ef Matomo 2018-09-20 09:42:22 +02:00
Luc Didry
bd326a71e9 Update zanata URL in zanata.xml 2018-07-21 09:13:25 +02:00
JosephK
12da4824b3 Merge branch 'master' into 'master'
[hof] Sponsors + Contributors

See merge request framasoft/peertube/joinpeertube!30
2018-07-18 10:55:12 +02:00
JosephK
d8d42dcfbe [hof] fix html validation ? 2018-07-18 10:52:01 +02:00
JosephK
a3c0439950 [hof] fix html validation ? 2018-07-18 10:48:30 +02:00
JosephK
0b8b82d63b [hof] fix html validation ? 2018-07-18 10:43:41 +02:00
JosephK
26620d544f [hof] Sponsors + Contributors 2018-07-18 10:31:23 +02:00
Luc Didry
bafcd968d6
Fix #5 2018-06-21 10:38:29 +02:00
Luc Didry
924aae1d81
[i18n] Small changes + revert a string deletion 2018-06-21 09:34:09 +02:00
Luc Didry
052ba4a0b1
Make push-trads job branch-agnostic 2018-06-21 08:45:44 +02:00
Luc Didry
e790676075
Merge branch 'Midgard/joinpeertube-en-fixes' 2018-06-21 08:43:43 +02:00