aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-05-11 13:43:56 +0200
committerChocobozzz <me@florianbigard.com>2020-05-11 13:43:56 +0200
commitc9215a1be0ad77c360713a877aa9d931aacd5cb0 (patch)
tree0ce20aa56bc0637c7b14f9762f17c167e1bc0ad2
parent399b3bc9a638482e93de27a99a372b45fc3ece43 (diff)
downloadPeerTube-c9215a1be0ad77c360713a877aa9d931aacd5cb0.tar.gz
PeerTube-c9215a1be0ad77c360713a877aa9d931aacd5cb0.tar.zst
PeerTube-c9215a1be0ad77c360713a877aa9d931aacd5cb0.zip
Update code contributors
-rw-r--r--CREDITS.md49
-rw-r--r--server/tests/api/server/config.ts2
2 files changed, 43 insertions, 8 deletions
diff --git a/CREDITS.md b/CREDITS.md
index 910c67368..74ee27904 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -2,53 +2,69 @@
2 2
3 * Chocobozzz 3 * Chocobozzz
4 * Rigel Kent 4 * Rigel Kent
5 * Felix Ableitner
6 * Filip Bengtsson 5 * Filip Bengtsson
6 * Felix Ableitner
7 * Gérald Niel 7 * Gérald Niel
8 * Julien Maulny 8 * Julien Maulny
9 * Jorropo 9 * Jorropo
10 * Josh Morel 10 * Josh Morel
11 * Kim
11 * BO41 12 * BO41
12 * Francesc 13 * Francesc
13 * Frank Sträter
14 * Phongpanot 14 * Phongpanot
15 * Frank Sträter
16 * Tirifto
15 * John Livingston 17 * John Livingston
18 * Xabi
16 * buoyantair 19 * buoyantair
20 * Jeff Huang
21 * kimsible
17 * Attila F 22 * Attila F
23 * Balázs Úr
18 * Benjamin Bouvier 24 * Benjamin Bouvier
19 * Jan Keromnes 25 * Jan Keromnes
20 * Lucas Declercq 26 * Lucas Declercq
27 * knuxify
21 * matograine 28 * matograine
29 * Александр
22 * David Libeau 30 * David Libeau
23 * Florent F 31 * Florent F
24 * Luc Didry 32 * Luc Didry
25 * Nassim Bounouas 33 * Nassim Bounouas
34 * josé m
26 * Anne-Gaelle Moulun 35 * Anne-Gaelle Moulun
27 * BRAINS YUM 36 * BRAINS YUM
37 * Berto Te
28 * Côme 744 38 * Côme 744
29 * Dimitri Gilbert 39 * Dimitri Gilbert
30 * Florent Poinsaut 40 * Florent Poinsaut
31 * Green-Star 41 * Green-Star
32 * Micah Elizabeth Scott 42 * Micah Elizabeth Scott
43 * Quentin PAGÈS
33 * SVNET Libre 44 * SVNET Libre
34 * Thomas Kuntz 45 * Thomas Kuntz
35 * William Lahti 46 * William Lahti
36 * Wirebrass 47 * Wirebrass
37 * Angristan 48 * Angristan
49 * Chris Sakura 佐倉くりす on Youtube
38 * DontUseGithub 50 * DontUseGithub
39 * GunChleoc 51 * GunChleoc
40 * Marcin Mikołajczak 52 * Marcin Mikołajczak
53 * NorbiPeti
41 * Okhin 54 * Okhin
42 * Pierre-Alain TORET 55 * Pierre-Alain TORET
56 * Serge Victor
43 * Thomas Citharel 57 * Thomas Citharel
44 * clementbrizard 58 * clementbrizard
45 * kaiyou 59 * kaiyou
60 * Alberto Teira
46 * Andréas Livet 61 * Andréas Livet
47 * Andrés Maldonado 62 * Andrés Maldonado
48 * Aurélien Bertron 63 * Aurélien Bertron
49 * Hans Meiser 64 * Hans Meiser
50 * Jefferson Hernandez 65 * Jefferson Hernandez
51 * Kemal Oktay Aktoğan 66 * Kemal Oktay Aktoğan
67 * Kiro
52 * LecygneNoir 68 * LecygneNoir
53 * Leopere 69 * Leopere
54 * Manuela Silva 70 * Manuela Silva
@@ -58,10 +74,14 @@
58 * dada 74 * dada
59 * frankdelange 75 * frankdelange
60 * jonathanraes 76 * jonathanraes
77 * Al-Hassan Abdel-Raouf
61 * Andrew Morgan 78 * Andrew Morgan
79 * Arne Uplegger
62 * Aurélien Béranger 80 * Aurélien Béranger
63 * Average Dude 81 * Average Dude
64 * Axel Viala 82 * Axel Viala
83 * Balázs Meskó
84 * BitTube
65 * ButterflyOfFire 85 * ButterflyOfFire
66 * Ch 86 * Ch
67 * Dashie 87 * Dashie
@@ -71,17 +91,16 @@
71 * Florian 91 * Florian
72 * Frank de Lange 92 * Frank de Lange
73 * Gaëtan Rizio 93 * Gaëtan Rizio
74 * Jeff Huang
75 * Joan Montané 94 * Joan Montané
76 * Jocelyn Jaubert 95 * Jocelyn Jaubert
77 * Julien Lemaire 96 * Julien Lemaire
78 * Kim
79 * Lucas Teixeira 97 * Lucas Teixeira
80 * Lukas Winkler 98 * Lukas Winkler
81 * Manuel Viens 99 * Manuel Viens
82 * Millicent Billette 100 * Millicent Billette
101 * Mondo Xíbaro
83 * Moritz Warning 102 * Moritz Warning
84 * NorbiPeti 103 * Nojus
85 * Pierre Jaury 104 * Pierre Jaury
86 * Quentin 105 * Quentin
87 * Ronan 106 * Ronan
@@ -90,10 +109,14 @@
90 * ahmadsharifian 109 * ahmadsharifian
91 * framail 110 * framail
92 * les 111 * les
112 * libertas
113 * merty
93 * taziden 114 * taziden
94 * victor héry 115 * victor héry
116 * Àngel Pérez Beroy
95 * 3risian 117 * 3risian
96 * Acid Chicken (硫酸鶏) 118 * Acid Chicken (硫酸鶏)
119 * Adam Adamsky
97 * Adam Gauthier 120 * Adam Gauthier
98 * Adam Magnier 121 * Adam Magnier
99 * Adnane Belmadiaf 122 * Adnane Belmadiaf
@@ -111,19 +134,26 @@
111 * Brad Johnson 134 * Brad Johnson
112 * Cale 135 * Cale
113 * Charles de Lacombe 136 * Charles de Lacombe
137 * Chris Sakura 佐倉くりす on Youtube - 日本語は第二言語やけ、間違っとったら思いっきり叩いてくださいw つたない日本語ばっかりやけど頑張りまーす♪
138 * Christoph Geschwind
114 * Claude 139 * Claude
115 * Clément Brizard 140 * Clément Brizard
141 * David Dobryakov
116 * DeeJayBro 142 * DeeJayBro
117 * Edouard SCHWEISGUTH 143 * Edouard SCHWEISGUTH
118 * Edwin Alberto Amado Baron 144 * Edwin Alberto Amado Baron
145 * Emmanuel Pret
119 * Eric Brehault 146 * Eric Brehault
120 * Erwan Croze 147 * Erwan Croze
121 * Fabio Agreles Bezerra 148 * Fabio Agreles Bezerra
122 * Fernandez, ReK2 149 * Fernandez, ReK2
150 * Florian CUNY
123 * Glandos 151 * Glandos
124 * Haelwenn (lanodan) Monnier 152 * Haelwenn (lanodan) Monnier
125 * HesioZ 153 * HesioZ
126 * ICabaleiro 154 * ICabaleiro
155 * Ismaël Bouya
156 * Iván Cabaleiro
127 * Jacen 157 * Jacen
128 * Jacob 158 * Jacob
129 * Jacques Foucry 159 * Jacques Foucry
@@ -131,6 +161,7 @@
131 * Jarosław Maciejewski 161 * Jarosław Maciejewski
132 * Jessica Fairchild 162 * Jessica Fairchild
133 * Jorge Silva 163 * Jorge Silva
164 * Jos
134 * Julien Le Bras 165 * Julien Le Bras
135 * Knackie 166 * Knackie
136 * Kody 167 * Kody
@@ -140,6 +171,7 @@
140 * LiPeK 171 * LiPeK
141 * Lint 172 * Lint
142 * LoveIsGrief 173 * LoveIsGrief
174 * Lucien A
143 * Léo Andrès 175 * Léo Andrès
144 * ManMade-cube42 176 * ManMade-cube42
145 * Marco Zehe 177 * Marco Zehe
@@ -165,7 +197,6 @@
165 * Philip Durbin 197 * Philip Durbin
166 * Predatorix Phoenix 198 * Predatorix Phoenix
167 * Quentin Dupont 199 * Quentin Dupont
168 * Quentin PAGÈS
169 * Quentí 200 * Quentí
170 * ROPEDE 201 * ROPEDE
171 * Raphael 202 * Raphael
@@ -173,6 +204,7 @@
173 * Rech 204 * Rech
174 * Robin 205 * Robin
175 * Sankar 206 * Sankar
207 * Sebastian Paweł Wolski
176 * Simon Gilliot 208 * Simon Gilliot
177 * Simounet 209 * Simounet
178 * Stefan Schüller 210 * Stefan Schüller
@@ -182,12 +214,15 @@
182 * Yann Sionneau 214 * Yann Sionneau
183 * Yorwba 215 * Yorwba
184 * Yun 216 * Yun
217 * Yury Bulka
185 * Zig-03 218 * Zig-03
219 * [ Bie ] Watcharapong Suriyawan
186 * anmol26s 220 * anmol26s
187 * augier 221 * augier
188 * bikepunk 222 * bikepunk
189 * bsky 223 * bsky
190 * ctlaltdefeat 224 * ctlaltdefeat
225 * dingycle
191 * jomo 226 * jomo
192 * libertysoft3 227 * libertysoft3
193 * lsde 228 * lsde
@@ -205,6 +240,7 @@
205 * tomamplius 240 * tomamplius
206 * tuxayo 241 * tuxayo
207 * victor-long 242 * victor-long
243 * xcffl
208 * zacharystenger 244 * zacharystenger
209 * ‮noisawe 245 * ‮noisawe
210 * abdhessuk 246 * abdhessuk
@@ -336,4 +372,3 @@
336 * [Fork-Awesome](https://github.com/ForkAwesome/Fork-Awesome) 372 * [Fork-Awesome](https://github.com/ForkAwesome/Fork-Awesome)
337 * `playlist add` by Material UI 373 * `playlist add` by Material UI
338 * `language` by Aaron Jin 374 * `language` by Aaron Jin
339 * `npm` by Boboss74
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts
index 1d81e1dce..8580835d6 100644
--- a/server/tests/api/server/config.ts
+++ b/server/tests/api/server/config.ts
@@ -86,7 +86,7 @@ function checkInitialConfig (server: ServerInfo, data: CustomConfig) {
86 86
87 expect(data.followings.instance.autoFollowBack.enabled).to.be.false 87 expect(data.followings.instance.autoFollowBack.enabled).to.be.false
88 expect(data.followings.instance.autoFollowIndex.enabled).to.be.false 88 expect(data.followings.instance.autoFollowIndex.enabled).to.be.false
89 expect(data.followings.instance.autoFollowIndex.indexUrl).to.equal('https://instances.joinpeertube.org') 89 expect(data.followings.instance.autoFollowIndex.indexUrl).to.equal('')
90} 90}
91 91
92function checkUpdatedConfig (data: CustomConfig) { 92function checkUpdatedConfig (data: CustomConfig) {