diff --git a/CREDITS.md b/CREDITS.md
index a54cfe5f3..6cc369482 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -8,8 +8,8 @@
* Simon Brosdetzko
* Александр
* Berto Te
- * Clemens Schielicke
* Jeff Huang
+ * Clemens Schielicke
* kontrollanten
* Laurent Ettouati
* Racida S
@@ -24,23 +24,23 @@
* GunChleoc
* Slimane Selyan AMIRI
* Zet
- * x
* Frank Sträter
+ * x
* Julien Maulny
+ * Kimsible
* Mark Van den Borre
+ * John Livingston
* Jorropo
* Josh Morel
* BO41
* Balázs Meskó
- * Francesc
- * John Livingston
- * mando laress
* Eivind Ødegård
+ * Francesc
+ * mando laress
* Quentin PAGÈS
* Besnik Bleta
* Ihor Hordiichuk
* ButterflyOfFire
- * Kimsible
* Xabi
* buoyantair
* Balázs Úr
@@ -85,6 +85,7 @@
* Frank Chang
* Green-Star
* Micah Elizabeth Scott
+ * Poslovitch
* SVNET Libre
* Thomas Kuntz
* William Lahti
@@ -104,7 +105,6 @@
* Mildred
* Okhin
* Pierre-Alain TORET
- * Poslovitch
* Serge Victor
* Théo Le Calvar
* Ugaitz
@@ -125,9 +125,11 @@
* Daniele Garau
* Dep Pranata
* Ehsan Gholami
+ * Eric Guichaoua
* Girish Ramakrishnan
* Hakim Oubouali
* Hans Meiser
+ * Hồ Nhất Duy
* Iñigo A
* Jefferson Hernandez
* Joan Montané
@@ -166,7 +168,6 @@
* Diazepan Medina
* Dirk Kelly
* EndoGai
- * Eric Guichaoua
* Florent Fayolle
* Florian
* Frank de Lange
@@ -189,6 +190,7 @@
* Quentin
* Ronan
* SerCom_KC
+ * Stakovicz
* Thai Localization
* Valvin
* YiDai
@@ -384,6 +386,7 @@
* norrist
* osauzet
* philippe lhardy
+ * plr20
* potedeo
* sanchis
* spf
@@ -529,6 +532,7 @@
* `video-language` by Rigel Kent (CC-BY)
* `peertube-x` by Solen DP (CC-BY)
* `flame` by Freepik (Flaticon License)
+ * `local` by Larea (CC-BY)
# Contributors to our 2020 crowdfunding :heart:
diff --git a/client/angular.json b/client/angular.json
index dc50bf709..39fe7aa51 100644
--- a/client/angular.json
+++ b/client/angular.json
@@ -160,7 +160,7 @@
"debug",
"p2p-media-loader-hlsjs",
"video.js",
- "sha1",
+ "sha.js/sha1",
"postcss",
"core-js/features/reflect"
],
diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.ts
index 77592cbb6..4e00d0bce 100644
--- a/client/src/app/core/menu/menu.service.ts
+++ b/client/src/app/core/menu/menu.service.ts
@@ -83,7 +83,7 @@ export class MenuService {
priority: 130
},
{
- icon: 'octagon' as 'octagon',
+ icon: 'local' as 'local',
label: $localize`Local videos`,
menuLabel: $localize`Local videos`,
path: '/videos/local',
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts
index a4dd72db6..a47f07fc3 100644
--- a/client/src/app/shared/shared-icons/global-icon.component.ts
+++ b/client/src/app/shared/shared-icons/global-icon.component.ts
@@ -17,6 +17,7 @@ const icons = {
'follower': require('!!raw-loader?!../../../assets/images/misc/account-arrow-left.svg').default, // material ui
'following': require('!!raw-loader?!../../../assets/images/misc/account-arrow-right.svg').default, // material ui
'flame': require('!!raw-loader?!../../../assets/images/misc/flame.svg').default,
+ 'local': require('!!raw-loader?!../../../assets/images/misc/local.svg').default,
// feather icons
'flag': require('!!raw-loader?!../../../assets/images/feather/flag.svg').default,
@@ -72,7 +73,6 @@ const icons = {
'repeat': require('!!raw-loader?!../../../assets/images/feather/repeat.svg').default,
'message-circle': require('!!raw-loader?!../../../assets/images/feather/message-circle.svg').default,
'codesandbox': require('!!raw-loader?!../../../assets/images/feather/codesandbox.svg').default,
- 'octagon': require('!!raw-loader?!../../../assets/images/feather/octagon.svg').default,
'award': require('!!raw-loader?!../../../assets/images/feather/award.svg').default
}
diff --git a/client/src/assets/images/feather/octagon.svg b/client/src/assets/images/feather/octagon.svg
deleted file mode 100644
index 1ed9bacbf..000000000
--- a/client/src/assets/images/feather/octagon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/client/src/assets/images/misc/local.svg b/client/src/assets/images/misc/local.svg
new file mode 100644
index 000000000..99012b98a
--- /dev/null
+++ b/client/src/assets/images/misc/local.svg
@@ -0,0 +1,3 @@
+
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 06e55532a..4f2421aea 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -62,7 +62,8 @@
@mixin apply-svg-color ($color) {
::ng-deep .feather,
- ::ng-deep .material {
+ ::ng-deep .material,
+ ::ng-deep .misc {
color: $color;
}
}
diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index a077f77a9..db5af3f91 100755
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -37,6 +37,7 @@ async function run () {
console.log(' * `video-language` by Rigel Kent (CC-BY)')
console.log(' * `peertube-x` by Solen DP (CC-BY)')
console.log(' * `flame` by Freepik (Flaticon License)')
+ console.log(' * `local` by Larea (CC-BY)')
}
{