Commit graph

418 commits

Author SHA1 Message Date
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
JosephK
b98bd1a1e1 Fix bouton github en double 2018-03-21 12:28:36 +01:00
JosephK
9a918f7466 Merge branch 'pouhiou-modifs' into 'master'
première révision des textes FR

See merge request framasoft/joinpeertube!9
2018-03-21 12:00:18 +01:00
Pouhiou
56abe764b9 trad des boutons 2018-03-21 11:49:50 +01:00
Pouhiou
77ccdaaa60 correcion commentaire imbriqué 2018-03-21 11:44:15 +01:00
Pouhiou
662424e39f première révision des textes FR 2018-03-21 11:40:41 +01:00
Chocobozzz
d370bdcedd Merge branch 'change-aide-to-support' into 'master'
Changement de « Aide » en « Support ».

See merge request framasoft/joinpeertube!8
2018-03-21 09:37:39 +01:00
Thomas Citharel
0fb3fa175d Changement de « Aide » en « Support ».
En effet, on a un bouton Documentation à côté, qui est aussi de l'aide, alors que le bouton « Aide » renvoie vers le forum, qui est davantage du support.
2018-03-21 09:36:49 +01:00
JosephK
c05a4c6300 Validation HTML (FAQ) 2018-03-21 09:34:20 +01:00
JosephK
29cc1ebe18 FAQ 2018-03-21 09:28:51 +01:00
Thomas Citharel
9eee486ae5 Merge branch 'feature/continue-joinpeertube' into 'master'
Shuffle instances

See merge request framasoft/joinpeertube!7
2018-03-16 14:58:50 +01:00
Chocobozzz
775333719d
Shuffle instances 2018-03-16 14:42:57 +01:00
Chocobozzz
caa1229514 Merge branch 'feature/continue-joinpeertube' into 'master'
Add stats information

See merge request framasoft/joinpeertube!6
2018-03-16 13:45:24 +01:00
Chocobozzz
6ed5bd68dd
Add stats information 2018-03-16 11:32:58 +01:00
Chocobozzz
ef04a58388 Merge branch 'feature/continue-joinpeertube' into 'master'
Begin texts in french

See merge request framasoft/joinpeertube!5
2018-03-16 10:47:33 +01:00
Chocobozzz
9c8eebbcb9
Fix @spf remarks 2018-03-16 10:46:36 +01:00
Chocobozzz
c12aa58b11
Take into account @tcit remarks 2018-03-16 10:13:35 +01:00
Chocobozzz
80cd6ed7b4
Begin texts in french 2018-03-16 09:59:45 +01:00
Chocobozzz
ca4cf8e630 Merge branch 'feature/continue-joinpeertube' into 'master'
Handle errors in instance listing

See merge request framasoft/joinpeertube!4
2018-03-15 17:04:26 +01:00
Chocobozzz
90c239ef66
Handle errors in instance listing 2018-03-15 16:36:41 +01:00
Chocobozzz
038c1d1777 Merge branch 'feature/continue-joinpeertube' into 'master'
Dynamic instances list

See merge request framasoft/joinpeertube!3
2018-03-15 16:14:45 +01:00
Chocobozzz
651c10260f
Dynamic instances list 2018-03-15 16:12:18 +01:00
Chocobozzz
715c33866b Merge branch 'feature/continue-joinpeertube' into 'master'
Remove as seen on

Closes #1

See merge request framasoft/joinpeertube!2
2018-03-15 16:12:16 +01:00