lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,995 Commits 2 Branches 0 Tags 64 MiB
61afd029df
Commit Graph

66 Commits

Author SHA1 Message Date
SenorSmartyPants
de9a350bad Backport pull request #8212 from jellyfin/release-10.8.z 
Add resolution text for 384 sized video

Original-merge: 7ffdde9a0b88f543a84fa8a3fa7487cbe8dda8b4

Merged-by: Cody Robibero <cody@robibe.ro>

Backported-by: Joshua Boniface <joshua@boniface.me>
 2022-08-13 21:46:34 -04:00
Joshua Boniface
924b0740b1 Backport pull request #8104 from jellyfin/release-10.8.z 
Add resolution text output for more resolutions

Authored-by: Shadowghost <Ghost_of_Stone@web.de>

Merged-by: Bond-009 <bond.009@outlook.com>

Original-merge: 2b46917dcf7af970dc95d4ef0bbfebac7a520d25
 2022-07-20 19:29:08 -04:00
Cody Robibero
a7b1132c92 Merge pull request #7842 from crobibero/dependency-backport 
(cherry picked from commit df6c5b6d421aeac7c4c29f9eab75b92f2c3c7ce7)
Signed-off-by: crobibero <cody@robibe.ro>
 2022-06-06 09:20:07 -04:00
dependabot[bot]
7ac06429d9
Bump Moq from 4.17.2 to 4.18.1 (#7820) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-04 00:27:45 +02:00
dependabot[bot]
0f6bd264ae
Bump Microsoft.NET.Test.Sdk from 17.1.0 to 17.2.0 (#7760) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-25 19:06:17 +02:00
Joshua M. Boniface
2d8f7b46f1 Merge pull request #7699 from Shadowghost/streambuilder-fix 
(cherry picked from commit b46d61dfdf5e068a9feb26d8b41377a9fdb2cba6)
Signed-off-by: crobibero <cody@robibe.ro>
 2022-05-20 18:30:57 -04:00
dependabot[bot]
812841d01e
Bump StyleCop.Analyzers from 1.2.0-beta.406 to 1.2.0-beta.435 (#7726) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-09 15:24:09 +02:00
dependabot[bot]
37b87bc231
Bump xunit.runner.visualstudio from 2.4.3 to 2.4.5 (#7727) 
Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.4.3 to 2.4.5.
- [Release notes](https://github.com/xunit/visualstudio.xunit/releases)
- [Commits](https://github.com/xunit/visualstudio.xunit/commits)

---
updated-dependencies:
- dependency-name: xunit.runner.visualstudio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-09 15:23:45 +02:00
Cody Robibero
688553b9a8 Merge pull request #7537 from dmitrylyzo/fix-streambuilder 
(cherry picked from commit 5833c707259247338c27b1a75a175c5aba925c29)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
 2022-04-17 15:45:10 -04:00
Cody Robibero
1960b5bdce Merge pull request #7523 from crobibero/null-stream 
Allow media without streams to playback 

(cherry picked from commit 577325b7888c5769c9d9c329ebd40e5f388242ad)
Signed-off-by: crobibero <cody@robibe.ro>
 2022-04-07 12:54:58 -04:00
dependabot[bot]
dde984bd0e
Bump StyleCop.Analyzers from 1.2.0-beta.376 to 1.2.0-beta.406 
Bumps [StyleCop.Analyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers) from 1.2.0-beta.376 to 1.2.0-beta.406.
- [Release notes](https://github.com/DotNetAnalyzers/StyleCopAnalyzers/releases)
- [Commits](https://github.com/DotNetAnalyzers/StyleCopAnalyzers/compare/1.2.0-beta.376...1.2.0-beta.406)

---
updated-dependencies:
- dependency-name: StyleCop.Analyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-21 12:22:11 +00:00
Bond-009
bb7068cb63
Move StreamBuilderTests to correct project (#7461) 2022-03-18 22:19:02 +01:00
Joe Rogers
1a307db7eb
Add label for external audio/sub tracks 2022-03-10 22:20:35 +01:00
dependabot[bot]
06f259001c
Bump Microsoft.NET.Test.Sdk from 17.0.0 to 17.1.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.0.0 to 17.1.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v17.0.0...v17.1.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-21 12:01:10 +00:00
dependabot[bot]
7649391b9d
Bump coverlet.collector from 3.1.1 to 3.1.2 
Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/coverlet-coverage/coverlet/releases)
- [Commits](https://github.com/coverlet-coverage/coverlet/commits)

---
updated-dependencies:
- dependency-name: coverlet.collector
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-07 12:01:11 +00:00
dependabot[bot]
6af7d5445f
Bump coverlet.collector from 3.1.0 to 3.1.1 (#7266) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-02-01 22:29:41 +01:00
Bond_009
2dcb2f8a9f Ban the usage of Task.Result 
If the calling function can't be made async easily you can still use
.GetAwaiter().GetResult(), which is way easier to find in the future
 2022-01-22 16:48:31 +01:00
dependabot[bot]
88e02c5290
Bump FsCheck.Xunit from 2.16.3 to 2.16.4 
Bumps [FsCheck.Xunit](https://github.com/fsharp/FsCheck) from 2.16.3 to 2.16.4.
- [Release notes](https://github.com/fsharp/FsCheck/releases)
- [Changelog](https://github.com/fscheck/FsCheck/blob/master/FsCheck%20Release%20Notes.md)
- [Commits](https://github.com/fsharp/FsCheck/compare/2.16.3...2.16.4)

---
updated-dependencies:
- dependency-name: FsCheck.Xunit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-10 12:01:16 +00:00
Bond_009
dc222b75c5 Remove incorrect mime type image/jpg 2022-01-04 10:40:16 +01:00
Cody Robibero
fcb8ff7c0f
Merge pull request #7052 from crobibero/image.jpeg 2022-01-03 17:47:52 -07:00
Cody Robibero
6804624c15 Add image/jpg to extension lookup 2021-12-25 11:41:39 -07:00
Bond_009
cbfa355e31 Update StyleCop 2021-12-24 18:28:27 +01:00
Bond_009
7ee96a59d3 Use correct jpeg MIME type 
image/jpg isn't a valid MIME type
 2021-12-12 02:07:35 +01:00
Ahmed Rafiq
cf75f99f0e
Update unit test name 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-12-04 21:14:52 +06:00
Ahmed Rafiq
fa6f6515a6
Update unit test name 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-12-04 21:14:16 +06:00
Ahmed Rafiq
6193fdea69 Use MimeTypes package to determine MIME type 
This simplifies the code since we don't have to keep large mappings of extensions and MIME types.

We still keep the ability to override the mappings for:
- filling in entries not present in the package, for e.g. ".azw3"
- picking preferred extensions, for e.g. MimeTypes provides ".conf" as a possible extionsion for "text/plain", and while that is correct, ".txt" would be preferrable
- compatibility reasons
 2021-12-04 20:08:16 +06:00
Bond_009
5265b3eee7 Replace PBKDF2-SHA1 with PBKDF2-SHA512 
This also migrates already created passwords on login

Source for the number of iterations:
https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#pbkdf2
 2021-11-10 22:34:54 +01:00
dependabot[bot]
baafa10e87
Bump Microsoft.NET.Test.Sdk from 16.11.0 to 17.0.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.11.0 to 17.0.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.11.0...v17.0.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-01 12:00:53 +00:00
KonH
b6bf43af45 Fix warning: Using directive is not required by the code and can be safely removed (#2149) 2021-10-03 10:49:41 +07:00
Bond-009
8858d8e597
Merge branch 'master' into theorydata 2021-09-25 22:24:57 +02:00
Bond_009
13fbfe6091 Target net6.0 2021-09-24 20:15:46 +02:00
ianjazz246
19b8bcaec4 Use TheoryData instead of MemberData and ClassData 2021-09-11 13:31:24 -07:00
dependabot[bot]
c52fc714aa
Bump FsCheck.Xunit from 2.16.1 to 2.16.3 
Bumps [FsCheck.Xunit](https://github.com/fsharp/FsCheck) from 2.16.1 to 2.16.3.
- [Release notes](https://github.com/fsharp/FsCheck/releases)
- [Changelog](https://github.com/fscheck/FsCheck/blob/master/FsCheck%20Release%20Notes.md)
- [Commits](https://github.com/fsharp/FsCheck/compare/2.16.1...2.16.3)

---
updated-dependencies:
- dependency-name: FsCheck.Xunit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-06 12:01:04 +00:00
Mike
cf9c678406
Add subtitle format(codec) to stream display title (#5853) 
Co-authored-by: Michał Kurek <michal.kurek@mail.com>
 2021-09-01 18:59:59 +02:00
dependabot[bot]
e40fde04d6
Bump FsCheck.Xunit from 2.16.0 to 2.16.1 
Bumps [FsCheck.Xunit](https://github.com/fsharp/FsCheck) from 2.16.0 to 2.16.1.
- [Release notes](https://github.com/fsharp/FsCheck/releases)
- [Changelog](https://github.com/fscheck/FsCheck/blob/master/FsCheck%20Release%20Notes.md)
- [Commits](https://github.com/fsharp/FsCheck/compare/2.16.0...2.16.1)

---
updated-dependencies:
- dependency-name: FsCheck.Xunit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-30 12:00:52 +00:00
Bond-009
d9f7b84156
Merge pull request #6438 from jellyfin/dependabot/nuget/FsCheck.Xunit-2.16.0 
Bump FsCheck.Xunit from 2.15.3 to 2.16.0
 2021-08-16 14:53:56 +02:00
dependabot[bot]
ee37784a35
Bump Microsoft.NET.Test.Sdk from 16.10.0 to 16.11.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.10.0 to 16.11.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.10.0...v16.11.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-16 12:01:04 +00:00
dependabot[bot]
4077cb2648
Bump FsCheck.Xunit from 2.15.3 to 2.16.0 
Bumps [FsCheck.Xunit](https://github.com/fsharp/FsCheck) from 2.15.3 to 2.16.0.
- [Release notes](https://github.com/fsharp/FsCheck/releases)
- [Changelog](https://github.com/fscheck/FsCheck/blob/master/FsCheck%20Release%20Notes.md)
- [Commits](https://github.com/fsharp/FsCheck/compare/2.15.3...2.16.0)

---
updated-dependencies:
- dependency-name: FsCheck.Xunit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-16 12:00:55 +00:00
Rich Lander
c07e83fdf8
Invert code and style analysis configuration (#6334) 
Co-authored-by: Bond-009 <bond.009@outlook.com>
 2021-07-30 09:49:28 +02:00
dependabot[bot]
33359d45be
Bump coverlet.collector from 3.0.3 to 3.1.0 
Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/coverlet-coverage/coverlet/releases)
- [Commits](https://github.com/coverlet-coverage/coverlet/commits/v3.1.0)

---
updated-dependencies:
- dependency-name: coverlet.collector
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-26 12:00:45 +00:00
Bond-009
f3b51dd77b
Update tests/Jellyfin.Model.Tests/Entities/MediaStreamTests.cs 
Co-authored-by: Max Rumpf <max.rumpf1998@gmail.com>
 2021-07-24 14:03:08 +02:00
Bond_009
0512f74459 Add tests for GetResolutionText 2021-07-20 23:04:49 +02:00
Bond_009
6f8ccab788 Move non-jellyfin extensions to separate project 2021-06-19 18:04:46 +02:00
Bond_009
915855e422 Add property based testing 2021-06-05 13:32:22 +02:00
dependabot[bot]
38ebd6147a
Bump Microsoft.NET.Test.Sdk from 16.9.4 to 16.10.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.4 to 16.10.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.4...v16.10.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-31 12:01:11 +00:00
Bond_009
39931fe3ad Add regression test for ContainerProfile.ContainsContainer 2021-05-05 13:33:34 +02:00
BaronGreenback
bc1cc2d04a Remove unused using directives 2021-04-17 11:37:55 +01:00
dependabot[bot]
7c70205326
Bump Microsoft.NET.Test.Sdk from 16.9.1 to 16.9.4 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.1 to 16.9.4.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.1...v16.9.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-02 22:42:12 +00:00
Bond_009
d202df6e8a Remove useless line 2021-03-09 03:22:51 +01:00
Bond_009
9ed7f429c0 FxCop -> Net Analyzers (part 1) 2021-03-09 03:04:47 +01:00