Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe…

…at/making-adding-themes-easier
kommunarr · Jun 15, 2024 · 188b4bc · 188b4bc
2 parents eb160bb + 74d01f8
commit 188b4bc
Show file tree

Hide file tree

Showing 189 changed files with 5,692 additions and 2,930 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -112,6 +112,9 @@ module.exports = {
         ignoreText: ['-', '•', '/', 'YouTube', 'Invidious', 'FreeTube']
       }
     ],
+    // Only applicable when we upgrade to Vue 3 and vue-i18n 9+
+    '@intlify/vue-i18n/no-deprecated-tc': 'off',
+
     'vue/require-explicit-emits': 'error',
     'vue/no-unused-emit-declarations': 'error',
   },

diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: check if prs are dirty
-        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        uses: eps1lon/actions-label-merge-conflict@v3
         with:
           dirtyLabel: "PR: merge conflicts / rebase needed"
           removeOnDirtyLabel: "PR: waiting for review"

diff --git a/_icons/.icon-set/iconColor_256.png b/_icons/.icon-set/iconColor_256.png
diff --git a/_icons/.icon-set/icon_128x128.png b/_icons/.icon-set/icon_128x128.png
diff --git a/_icons/.icon-set/icon_16x16.png b/_icons/.icon-set/icon_16x16.png
diff --git a/_icons/.icon-set/icon_32x32.png b/_icons/.icon-set/icon_32x32.png
diff --git a/_icons/.icon-set/icon_48x48.png b/_icons/.icon-set/icon_48x48.png
diff --git a/_icons/.icon-set/icon_64x64.png b/_icons/.icon-set/icon_64x64.png
diff --git a/_icons/256x256.png b/_icons/256x256.png
diff --git a/_icons/icon.svg b/_icons/icon.svg
diff --git a/_icons/iconBlack.svg b/_icons/iconBlack.svg
diff --git a/_icons/iconBlackSmall.svg b/_icons/iconBlackSmall.svg
diff --git a/_icons/iconCatppuccinMochaDarkSmall.svg b/_icons/iconCatppuccinMochaDarkSmall.svg
diff --git a/_icons/iconCatppuccinMochaLightSmall.svg b/_icons/iconCatppuccinMochaLightSmall.svg
diff --git a/_icons/iconColor.ico b/_icons/iconColor.ico
diff --git a/_icons/iconColor.png b/_icons/iconColor.png
diff --git a/_icons/iconColor.svg b/_icons/iconColor.svg
diff --git a/_icons/iconColorSmall.svg b/_icons/iconColorSmall.svg
diff --git a/_icons/iconDraculaDarkSmall.svg b/_icons/iconDraculaDarkSmall.svg
diff --git a/_icons/iconDraculaLightSmall.svg b/_icons/iconDraculaLightSmall.svg
diff --git a/_icons/iconNordicLightSmall.svg b/_icons/iconNordicLightSmall.svg
diff --git a/_icons/iconSolarizedDarkSmall.svg b/_icons/iconSolarizedDarkSmall.svg
diff --git a/_icons/iconSolarizedLightSmall.svg b/_icons/iconSolarizedLightSmall.svg