Commit graph

440 commits

Author SHA1 Message Date
Chocobozzz
b9b39ec6ae Merge branch 'master' into 'master'
Fix french word

See merge request framasoft/peertube/joinpeertube!26
2018-05-31 14:26:35 +02:00
Chocobozzz
6892d08c47
Fix french word 2018-05-30 17:49:45 +02:00
Nathalie Rafaralahy
762a2c8484 Link to framacolibri changed 2018-05-29 11:15:09 +02:00
Luc Didry
21354d4174 Set default language to "en" 2018-05-26 09:14:31 +02:00
Chocobozzz
0dda9f187a Merge branch 'master' into 'master'
Update forum url for english users

See merge request framasoft/peertube/joinpeertube!25
2018-05-25 18:52:33 +02:00
Chocobozzz
93679398a5
Update forum url for english users 2018-05-25 18:49:22 +02:00
JosephK
d0899a04aa Financial contributors list disabled 2018-05-24 19:04:09 +02:00
JosephK
70f78a94bb KKBB link fr 2018-05-24 18:55:44 +02:00
Pierre-Yves Gosset
dd8a47f3f8 Merge branch 'master' into 'master'
Campaign KKBB

See merge request framasoft/peertube/joinpeertube!24
2018-05-24 18:31:23 +02:00
JosephK
916f308e01 Oups… 2018-05-24 16:08:12 +02:00
JosephK
bcdb964073 Fix extra <p> 2018-05-24 16:01:35 +02:00
JosephK
ccf2f37ee2 Text, cowntdown, links, video and devs in hof 2018-05-24 15:57:14 +02:00
Chocobozzz
8da19a4a95 Merge branch 'master' into 'master'
Fix open graph

See merge request framasoft/peertube/joinpeertube!23
2018-05-24 13:50:54 +02:00
JosephK
87e643de52 trad hall of fame 2018-05-24 12:23:54 +02:00
JosephK
d973644906 no frameborder 2018-05-24 12:02:27 +02:00
JosephK
ac416c27a4 Hall of Fame + Campaign 2018-05-24 11:59:12 +02:00
Chocobozzz
b8c85ae5e1
Fix open graph 2018-05-24 11:46:29 +02:00
Chocobozzz
32c6a4db5c Merge branch 'master' into 'master'
Improve meta tags

See merge request framasoft/peertube/joinpeertube!22
2018-05-24 11:17:12 +02:00
Chocobozzz
0452ffdf53
Improve meta tags 2018-05-24 11:13:33 +02:00
Chocobozzz
3259cdcfe2 Merge branch 'master' into 'master'
Fix tags image url

See merge request framasoft/peertube/joinpeertube!21
2018-05-22 17:23:22 +02:00
Chocobozzz
676a18506b
Fix tags image url 2018-05-22 17:19:53 +02:00
JosephK
0f54f2c59d Merge branch 'master' into 'master'
Master

See merge request framasoft/peertube/joinpeertube!20
2018-05-22 14:09:50 +02:00
Chocobozzz
07b3f1f7a9
More space for instances meta data 2018-05-18 17:35:22 +02:00
Chocobozzz
20727b99e5
Update embed link for the english page 2018-05-18 17:33:41 +02:00
Chocobozzz
aa56cf0682
Better opengraph tags and add instances link 2018-05-18 17:28:56 +02:00
Chocobozzz
a1cd0a3972 Merge branch 'master' into 'master'
Retouches CSS

See merge request framasoft/peertube/joinpeertube!19
2018-04-05 15:58:22 +02:00
JosephK
d2dfb56a30 Background faq (+footer), buttons colibri+framatube 2018-04-05 14:31:06 +02:00
Luc Didry
e9ad5431fc Merge branch 'pouhiou-modifs' into 'master'
Refonte MR Pouhiou (!17)

See merge request framasoft/joinpeertube!18
2018-04-04 16:12:43 +02:00
Luc Didry
33e752215e Refonte MR Pouhiou (!17) 2018-04-04 15:11:16 +02:00
Luc Didry
3d8feb4244 Add small contribution guide to readme 2018-04-04 11:27:24 +02:00
Luc Didry
411b639670 Udpate EN translation, thanks to noplanman 2018-04-01 14:33:00 +02:00
Luc Didry
417b4cd4a8 [zanata] Improve zanata process 2018-04-01 14:33:00 +02:00
Luc Didry
379a664b3a FR correction for easier translation 2018-04-01 14:33:00 +02:00
Chocobozzz
8e2d076e10 Merge branch 'feature/fix-chocobozzz' into 'master'
Add user quota by instance

See merge request framasoft/joinpeertube!16
2018-03-30 11:35:25 +02:00
Chocobozzz
980bb45bb0
Add user quota by instance 2018-03-28 14:40:42 +02:00
Chocobozzz
9683df8656 Merge branch 'zanata-integration' into 'master'
[zanata] Zanata integration

See merge request framasoft/joinpeertube!14
2018-03-28 11:38:58 +02:00
Chocobozzz
1f32e9b15b Merge branch 'feature/fix-instances' into 'master'
Fix instances list URL

See merge request framasoft/joinpeertube!15
2018-03-27 11:25:52 +02:00
Chocobozzz
ee17e9a788
Fix instances list URL 2018-03-27 11:24:21 +02:00
Luc Didry
fd9654b6eb Update en translation 2018-03-26 17:31:42 +02:00
Luc Didry
a7b80e843d [zanata] Zanata integration 2018-03-26 17:30:09 +02:00
Chocobozzz
507b441ef1 Merge branch 'feature/continue-joinpeertube' into 'master'
Fix style with long description

See merge request framasoft/joinpeertube!13
2018-03-22 16:16:04 +01:00
Chocobozzz
afbbf8b45c
Fix style with long description 2018-03-22 14:38:08 +01:00
JosephK
d0931a5d2d Merge branch 'master' into 'master'
Bouton sur les liens forum et faq

See merge request framasoft/joinpeertube!12
2018-03-21 20:59:00 +01:00
JosephK
c4d6de2f27 Bouton sur les liens forum et faq 2018-03-21 20:56:16 +01:00
JosephK
b0f4cbd67e Merge branch 'pouhiou-modifs' into 'master'
Pouhiou modifs

See merge request framasoft/joinpeertube!11
2018-03-21 19:12:33 +01:00
Pouhiou
7e31d10943 ajouts boutons faq et forum 2018-03-21 18:02:44 +01:00
JosephK
1fc01cdfde Merge branch 'master' into 'master'
Aperçu sur les Gitlab Pages du fork de l’utilisateur

See merge request framasoft/joinpeertube!10
2018-03-21 13:38:42 +01:00
JosephK
5d932cdbbf Preview on user’s Gitlab Pages 2018-03-21 13:24:15 +01:00
Pouhiou
9f4997d231 correction mineure 01 2018-03-21 13:04:13 +01:00
JosephK
9cfc4cfad5 Update style.css 2018-03-21 12:32:20 +01:00