Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
PartyDonut authored Jan 5, 2025
2 parents 6eff475 + 792ade3 commit 6f76cd8
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/general/networking/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Add `-subj '/CN=localhost'` to make it not ask interactive questions about conte
The above command creates `./privkey.pem` which will require one more step before use in Jellyfin.

```sh
openssl pkcs12 -export -out jellyfin.pfx -inkey privkey.pem -in /usr/local/etc/letsencrypt/live/domain.org/cert.pem -passout pass:
openssl pkcs12 -export -out jellyfin.pfx -inkey privkey.pem -in cert.pem -passout pass:
```

## Running Jellyfin Behind a Reverse Proxy
Expand Down
30 changes: 30 additions & 0 deletions docs/general/server/media/movies.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,36 @@ To group media manually, long-click or right-click media to highlight then selec

:::

## Movies Split Across Multiple Parts

Movies that are split into multiple files can be stacked together if named correctly. Files should be named as follows:

- `Movie Name (2010)/Movie Name<separator><parttype><separator><partnumber>.mkv`

The separator is optional between `<parttype>` and `<partnumber>`. `<partnumber>` can be any number, or the letters a-d.

Supported part types are:

- `cd`
- `dvd`
- `part`
- `pt`
- `disc`
- `disk`

Supported separators are:

- `(space)`
- `. (period)`
- `- (dash)`
- `_ (underscore)`

:::note

This does not work in conjunction with multiple versions or merging.

:::

## Movie Extras

Movie extras can include deleted scenes, interviews, and other various things that you would want to include alongside your movie. Jellyfin supports several different methods of adding these files.
Expand Down
8 changes: 5 additions & 3 deletions docs/general/server/media/shows.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,11 @@ Specials can also be shown within a season if so desired. This can be helpful wh

1. The option `Display specials within their series they aired in` under `Dashboard -> Library -> Display` must be enabled
2. The season and episode they aired before/after must be set within the metadata.
- These can be set in the Metadata editor or in an NFO using the `airsbefore_season`, `airsafter_season`, and `airsbefore_episode` tags.
- The `Airs before series` field can be set to show (and play) the special at the start of the season. It can also be combined with the `Airs before episode` field to insert it as a mid-season special before the specified episode.
- With `Airs after series`, set the Special will be shown (and played) at the end of the specified Season and the `Airs before series/episode` fields (if set) will have no effect.
- These can be set in the Metadata editor or in an NFO using the `airsbefore_season`, `airsafter_season`, and `airsbefore_episode` tags.
- When the `Airs before season` field is set but `Airs before episode` is not set, the special will play at the start of the specified season, before the first episode.
- The `Airs before season` can also be combined with the `Airs before episode` field to insert it as a mid-season special before the specified episode. For example, if `Airs before season` is set to `2` and `Airs before episode` is set to `7`, the special will play between S02E06 and S02E07.
- With `Airs after series`, set the Special will be shown (and played) at the end of the specified Season. This will take priority over the `Airs before season/episode` fields if they are set.
- When multiple specials have the same position, they will play in the order in which they are stored in the specials season. For example, if S00E01 and S00E03 both have `Airs before season` set to `3` and `Airs before episode` set to `7`, the order the content will play in is: S03E06 → S00E01 → S00E03 → S03E07.

Note that this will show them in both the `Specials` season, as well as the season specified.

Expand Down
3 changes: 3 additions & 0 deletions src/components/contact/MatrixCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ const MatrixCard = () => {
<li>
<a href='https://matrix.to/#/#jellyfin-ui-ux:matrix.org'>#jellyfin-ui-ux</a>
</li>
<li>
<a href='https://matrix.to/#/#jellyfin-hwa-tool:matrix.org'>#jellyfin-hwa-tool</a>
</li>
</ul>
</div>
</div>
Expand Down
26 changes: 25 additions & 1 deletion src/data/clients.ts
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ export const Clients: Array<Client> = [
id: 'app-store',
name: 'App Store',
url: 'https://apps.apple.com/us/app/manet-music/id6470928235'
},
}
],
secondaryLinks: [
{
Expand Down Expand Up @@ -952,6 +952,30 @@ export const Clients: Array<Client> = [
name: "GitHub",
url: "https://github.com/DonutWare/Fladder",
},
],
},
{
id: 'symfonium',
name: 'Symfonium',
description:
'An offline-first third-party music player that enhances your Jellyfin experience with streaming, syncing and full personalization',
clientType: ClientType.ThirdParty,
deviceTypes: [DeviceType.Mobile],
licenseType: LicenseType.Proprietary,
platforms: [Platform.Android],
primaryLinks: [
{
id: 'play-store',
name: 'Play Store',
url: 'https://play.google.com/store/apps/details?id=app.symfonik.music.player'
}
],
secondaryLinks: [
{
id: 'website',
name: 'Website',
url: 'https://symfonium.app/'
}
]
}
];

0 comments on commit 6f76cd8

Please sign in to comment.