pimhwang
/
movie-web
mirror of https://github.com/movie-web/movie-web.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' into dev

pull/280/head
panmlg 3 years ago committed by GitHub
parent
cce47fab5d fffc119e88
commit
571df9e0ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      index.html
  2. 2
      package.json
  3. 14
      src/setup/App.tsx
  4. 2
      src/setup/locales/fr/translation.json

3
index.html
Unescape View File

@ -29,6 +29,9 @@
<!-- prevent darkreader extension from messing with our already dark site --> <!-- prevent darkreader extension from messing with our already dark site -->
<meta name="darkreader-lock" /> <meta name="darkreader-lock" />
<!-- disabling referrer can fix some provider problems -->
<meta name="referrer" content="no-referrer" />
<title>movie-web</title> <title>movie-web</title>
</head> </head>
<body> <body>

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "movie-web", "name": "movie-web",
"version": "3.0.13", "version": "3.0.14",
"private": true, "private": true,
"homepage": "https://movie-web.app", "homepage": "https://movie-web.app",
"dependencies": { "dependencies": {

14
src/setup/App.tsx
Unescape View File

@ -40,8 +40,6 @@ function App() {
/> />
{/* other */} {/* other */}
{process.env.NODE_ENV === "development" ? (
<>
<Route <Route
exact exact
path="/dev" path="/dev"
@ -51,18 +49,22 @@ function App() {
/> />
<Route <Route
exact exact
path="/dev/test" path="/dev/video"
component={lazy( component={lazy(
() => import("@/views/developer/TestView") () => import("@/views/developer/VideoTesterView")
)} )}
/> />
{/* developer routes that can abuse workers are disabled in production */}
{process.env.NODE_ENV === "development" ? (
<>
<Route <Route
exact exact
path="/dev/video" path="/dev/test"
component={lazy( component={lazy(
() => import("@/views/developer/VideoTesterView") () => import("@/views/developer/TestView")
)} )}
/> />
<Route <Route
exact exact
path="/dev/providers" path="/dev/providers"

2
src/setup/locales/fr/translation.json
Unescape View File

@ -27,7 +27,7 @@
} }
}, },
"seasons": { "seasons": {
"seasonAndEpisode": "S{{saison}} E{{épisode}}" "seasonAndEpisode": "S{{season}} E{{episode}}"
}, },
"notFound": { "notFound": {
"genericTitle": "Introuvable", "genericTitle": "Introuvable",

Write Preview
Loading…
Cancel
Save