Skip to content

Commit 77d71d5

Browse files
committed
Merge branch 'master' into dependabot/hex/tailwind-0.3.1
2 parents 2aeeef3 + d078b8e commit 77d71d5

File tree

74 files changed

+777
-1552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+777
-1552
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
strategy:
4646
matrix:
47-
otp: [ '24' ]
47+
otp: [ '25' ]
4848
elixir: [ '1.15' ]
4949

5050
services:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN npm install
77

88
#-------------------------
99

10-
FROM elixir:1.15-otp-24-alpine
10+
FROM elixir:1.15-otp-25-alpine
1111

1212
ARG MIX_ENV="dev"
1313
ARG SECRET_KEY_BASE=""

README.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,6 @@ environment:
166166
* AAC / MP3 audio
167167
* MP4 / MKV container
168168

169-
### Subtitles
170-
171-
A single **.srt** file in the root directory of the video is currently supported. With this setup a subtitle / caption option will be available in the player view.
172-
173-
```
174-
library/video
175-
└──video.srt
176-
└──video.mp4
177-
```
178-
179169
## FAQ
180170

181171
### Why won't my media play?

dev/library/movies/Caminandes Llama Drama (2013)/Caminandes.Llama.Drama.1080p.en.srt

Lines changed: 0 additions & 8 deletions
This file was deleted.

dev/library/series/Pioneer One/Season 1/Pioneer.One.S01E01.Earthfall.720p.en.srt

Lines changed: 0 additions & 8 deletions
This file was deleted.

dev/library/series/Pioneer One/Season 1/Pioneer.One.S01E02.The.Man.From.Mars.720p.en.srt

Lines changed: 0 additions & 8 deletions
This file was deleted.

dev/radarr/config.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
<Branch>master</Branch>
1414
<SslCertPassword></SslCertPassword>
1515
<AuthenticationRequired>Enabled</AuthenticationRequired>
16+
<InstanceName>Radarr</InstanceName>
1617
</Config>

dev/sonarr/config.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66
<UrlBase></UrlBase>
77
<BindAddress>*</BindAddress>
88
<ApiKey>1accda4476394bfcaddefe8c4fd77d4a</ApiKey>
9-
<AuthenticationMethod>None</AuthenticationMethod>
9+
<AuthenticationMethod>External</AuthenticationMethod>
1010
<UpdateMechanism>Docker</UpdateMechanism>
1111
<LaunchBrowser>True</LaunchBrowser>
1212
<Branch>main</Branch>
1313
<InstanceName>Sonarr</InstanceName>
14+
<AuthenticationRequired>Enabled</AuthenticationRequired>
15+
<SslCertPath></SslCertPath>
16+
<SslCertPassword></SslCertPassword>
1417
</Config>

lib/media_server/actions/add_episode.ex

Lines changed: 0 additions & 22 deletions
This file was deleted.

lib/media_server/actions/add_movies.ex

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)