michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,826 Commits 2 Branches 79 Tags 73 MiB
b4d04f9ca5
Commit Graph

388 Commits

Author SHA1 Message Date
crobibero
056c44010b Fix tests 2020-11-15 12:19:07 -07:00
crobibero
dae4541bad Merge remote-tracking branch 'upstream/master' into dotnet-5 2020-11-15 11:56:35 -07:00
crobibero
e8b98265b0 Upgrade Jellyfin.Model.Tests to net5.0 2020-11-13 10:40:09 -07:00
crobibero
445eec7f5f Fix nullability errors in Jellyfin.Api.Tests 2020-11-13 09:21:22 -07:00
crobibero
0c23b8cadf Don't throw exception when converting values using binder or JsonConverter 2020-11-12 08:06:25 -07:00
Stepan
3bca1181b3 Taken suggestions from code review and created test for ExtraRuleType.Regex instead of throwing exception there. 2020-11-12 13:16:33 +01:00
Stepan
195a6261c4 Dummy test case explanation. 2020-11-10 19:28:03 +01:00
Stepan
158eff62d7 Xml-doc part2 2020-11-10 19:23:10 +01:00
crobibero
83629ab6f2 Update packages to net5 2020-11-10 09:52:34 -07:00
Stepan
c0747512d6 Merge remote-tracking branch 'jellyfin/master' into emby-namig-nullable 2020-11-10 12:42:49 +01:00
dependabot[bot]
e15891df51
Bump Microsoft.NET.Test.Sdk from 16.7.1 to 16.8.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.1 to 16.8.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.1...v16.8.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-09 12:00:39 +00:00
cvium
e78c63c4dc Remove OriginalAuthenticationInfo and add IsAuthenticated property 2020-11-08 16:10:33 +01:00
Claus Vium
c17f84ae48
Merge pull request #4330 from crobibero/api-key-auth 
Fix ApiKey authentication
 2020-11-08 08:20:50 +01:00
Stepan
3d1076ae42 Rest of tests for Emby.Naming code coverage 2020-11-07 12:30:22 +01:00
Stepan
f22e0800e2 Episode parsing coverage 2020-11-07 11:02:12 +01:00
crobibero
9056908bc7 Merge remote-tracking branch 'upstream/master' into video-resolver 2020-11-06 14:46:21 -07:00
Claus Vium
f172b37401
Merge pull request #4391 from crobibero/converter-ireadonlylist 
Support IReadOnlyList for JsonCommaDelimitedArrayConverter
 2020-11-06 15:16:14 +01:00
Stepan
3466dc5581 Finish coverage for Emby.Naming.Video 2020-11-05 16:59:15 +01:00
Stepan
5741150367 Enable MultiVersion video tests and added support for naming based on tests 11 & 8 2020-11-05 14:51:27 +01:00
Stepan
c96aa0551d Added NamingOptions tests 2020-11-05 13:25:29 +01:00
Greenback
3e62557959 amended testing unit. 2020-11-04 20:30:06 +00:00
BaronGreenback
ec245dce90
Merge branch 'master' into NetworkPR2 2020-11-04 20:17:41 +00:00
Stepan
aef1fe62c2 Complete test coverage for Emby.Naming.Subtitles 2020-11-03 16:25:33 +01:00
Stepan
c060ed1a18 Added resolving of alternative files and extras for audibooks. 2020-11-03 16:24:04 +01:00
Stepan
7b6363b09a Update test for detecting audiobooks extras and alternative files 2020-11-02 23:07:46 +01:00
Stepan
1e71775688 Add Name and Year parsing for audiobooks 2020-11-02 20:03:12 +01:00
crobibero
e41e832495 Dependency catch up 2020-11-01 10:52:32 -07:00
Stepan
50a2ef9d8a Simplify Resolve_InvalidExtension Test and created tests for Alternative Versions parsing & Year Extraction for audiobooks 2020-11-01 17:41:47 +01:00
Stepan
f39775dc3a Written test to finish coverage for AudioBookListResolver & AudioBookResolver and corrected some logical erros / unhandled exception 2020-11-01 17:10:48 +01:00
Stepan
60b49e67ea Re-Sharper inspection issues 2020-11-01 11:19:22 +01:00
Stepan
59619b6ea7 Enable nullable in Emby.Naming 2020-11-01 10:47:31 +01:00
Greenback
f06e4826c7 Fixed testing units 2020-10-31 19:16:28 +00:00
Greenback
83af636c61 Updated with new NetManager 2020-10-31 18:21:46 +00:00
Greenback
6dc2936d9c Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-30 13:54:46 +00:00
crobibero
42c2ab97e7 Support IReadOnlyList for JsonCommaDelimitedArrayConverter 2020-10-29 11:32:02 -06:00
dkanada
ec5fadc64e
Merge pull request #4347 from jellyfin/dependabot/nuget/Moq-4.14.7 
Bump Moq from 4.14.6 to 4.14.7
 2020-10-29 14:59:01 +09:00
crobibero
8b83e4e972 Fix tests 2020-10-28 17:57:16 -06:00
Bond-009
be2f27a069
Merge pull request #4312 from crobibero/json-array-converter 
Add comma delimited string to array json converter
 2020-10-27 19:36:37 +01:00
BaronGreenback
0b5ddc90ff
Merge branch 'master' into NetworkPR2 2020-10-26 13:21:48 +00:00
dependabot[bot]
ed8899da4c
Bump Moq from 4.14.6 to 4.14.7 
Bumps [Moq](https://github.com/moq/moq4) from 4.14.6 to 4.14.7.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.14.6...v4.14.7)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-19 12:00:52 +00:00
BaronGreenback
d42bb515ce
Merge branch 'master' into video-resolver 2020-10-17 09:26:14 +01:00
Joshua M. Boniface
86090ab1f6
Merge pull request #4317 from jellyfin/tests7 
Fix AudioBookListResolver test coverage
 2020-10-17 01:58:57 -04:00
crobibero
b2662894cf Add whitespace handling and tests 2020-10-16 09:37:35 -06:00
dkanada
5c2ecc0ca5
Merge pull request #4324 from crobibero/dotnet-3.1.9 
Update to dotnet 3.1.9
 2020-10-15 12:56:10 +09:00
crobibero
4b6889615b Fix tests 2020-10-14 18:21:15 -06:00
crobibero
f998e52107 Update to dotnet 3.1.9 2020-10-13 18:50:04 -06:00
Bond_009
74f4affcda Fix AudioBookListResolver test coverage 2020-10-12 20:09:15 +02:00
crobibero
7565ae22cb Add tests and switch to factory 2020-10-11 21:09:15 -06:00
crobibero
6a3a193dbb Fix and clean tests 2020-10-09 17:10:06 -06:00
Greenback
ebe650afa9 Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-09 14:12:41 +01:00
dkanada
f8657d70ff
Merge pull request #4277 from jellyfin/dependabot/nuget/Moq-4.14.6 
Bump Moq from 4.14.5 to 4.14.6
 2020-10-06 12:29:00 +09:00
Joshua M. Boniface
72ad3b327f
Merge pull request #4257 from Bond-009/tests3 
Add tests for deserializing guids
 2020-10-05 13:17:50 -04:00
dependabot[bot]
dba4df1977
Bump Moq from 4.14.5 to 4.14.6 
Bumps [Moq](https://github.com/moq/moq4) from 4.14.5 to 4.14.6.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.14.5...v4.14.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-05 12:00:58 +00:00
Bond_009
d7dc15971e Add roundtrip test 2020-10-04 16:26:43 +02:00
BaronGreenback
fae70bbbcf
Update LocalAccessHandlerTests.cs 2020-10-04 10:05:38 +01:00
github@esslinger.dev
ec0ff5d02f test: use descriptive test method names 2020-10-03 12:40:28 +02:00
github@esslinger.dev
1bd80a634f test: add CommaDelimitedArrayModelBinder tests 2020-10-03 01:09:45 +02:00
github@esslinger.dev
b3b98a5cc8 test: add TestType enum 2020-10-03 01:09:28 +02:00
Bond_009
8535a718b7 Add tests for deserializing guids 2020-10-02 19:43:34 +02:00
Jim Cartlidge
fcd1b2f0e4 Merged with latest master 2020-09-30 17:52:33 +01:00
Bond-009
c7b3d4a90c
Merge pull request #4164 from spooksbit/remove-browser-auto-load 
Removed browser auto-launch functionality
 2020-09-29 18:24:58 +02:00
Jim Cartlidge
5edf24db5c Updated to master 2020-09-24 15:34:30 +01:00
Anthony Lavado
2746e1fecc
Merge pull request #4189 from Bond-009/minor5 
Minor improvements
 2020-09-23 09:58:19 -04:00
dkanada
dfb2ef5cfe
Merge pull request #4126 from crobibero/3.1.8 
update to dotnet 3.1.8
 2020-09-23 19:52:37 +09:00
Bond_009
228b33a23b Minor improvements 2020-09-20 14:02:41 +02:00
spookbits
5cca8bffea Removed browser auto-load functionality from the server. 
Added profiles in launchSettings to start either the web client or the swagger API page.
Removed --noautorunwebapp as this is the default functionality.
 2020-09-16 13:22:04 -04:00
Jim Cartlidge
b04aed2f58 Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-09-14 16:01:23 +01:00
Jim Cartlidge
38b8110a3e Removing blank lines. 2020-09-14 15:55:25 +01:00
Jim Cartlidge
b44455ad0d Update based on PR1 changes. 2020-09-14 15:46:38 +01:00
crobibero
46ae51bc9a update to dotnet 3.1.8 2020-09-12 10:19:04 -06:00
Jim Cartlidge
9ef79d190b Large number of files 2020-09-12 16:41:37 +01:00
Keridos
ba777039ef
remove unnecessary nullchecks 2020-09-09 02:43:06 +02:00
Keridos
8eb1eedc8d
implement suggested changes 2020-09-09 02:33:59 +02:00
Keridos
b9c7cce696
some testing for AudioBook 
fix PartNumber detection
 2020-09-09 02:24:17 +02:00
Bond-009
6d154041b9
Merge pull request #3880 from DirtyRacer1337/datetime 
Fix year parsing
 2020-09-05 16:09:05 +02:00
Erwin de Haan
1c71ddc426 Merge MediaBrowser.Api.Tests into Jellyfin.Api.Tests 2020-09-03 23:13:46 +02:00
Erwin de Haan
7ced6d1c8c Enable code coverage and upload OpenAPI spec. 
Add basic test to write out the actual openapi spec.
 2020-09-03 22:44:31 +02:00
crobibero
5ad81f7fe6 Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-09-03 09:29:07 -06:00
Claus Vium
e337756428 Remove ServiceStack and related stuff 2020-09-02 12:22:14 +02:00
crobibero
b216b91e21 Bump Microsoft.NET.Test.Sdk and add missing reference 2020-08-31 08:14:22 -06:00
crobibero
bd66fd25df Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:00:05 -06:00
Bond-009
4f6c98b325
Merge pull request #3984 from crobibero/json-prerelease 
Use Prerelease System.Text.Json
 2020-08-26 18:59:46 +02:00
crobibero
8b96881aa1 Clean up json Converters 2020-08-26 08:22:48 -06:00
crobibero
582c016d3b bump to preview8 and remove extra references 2020-08-25 21:19:55 -06:00
crobibero
5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06:00
Patrick Barron
9fa4fff15d Merge branch 'master' into event-rewrite-1 
# Conflicts:
#	Emby.Dlna/Emby.Dlna.csproj
#	Emby.Dlna/Eventing/DlnaEventManager.cs
#	Emby.Dlna/Service/BaseService.cs
#	Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
#	MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
 2020-08-24 20:04:13 -04:00
crobibero
9626101c9f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-24 07:39:16 -06:00
Bond-009
03c89fa717
Merge pull request #3953 from crobibero/dotnetglob 
bump DotNet.Glob
 2020-08-21 22:32:47 +02:00
crobibero
89c9ca68f9 bump DotNet.Glob 2020-08-21 11:50:45 -06:00
Bond_009
301e029d42 Add unsupported ffmpeg version to tests 2020-08-20 17:45:40 +02:00
Bond_009
cb5cb075a9 Simplify FFmpeg detection code 2020-08-20 17:16:09 +02:00
Bond-009
5160e627f1
Merge branch 'master' into feature/ffmpeg-version-check 2020-08-20 16:40:03 +02:00
Patrick Barron
a77cf53573 Allow plugins to register services. 2020-08-16 17:25:14 -04:00
crobibero
6709645ec9 bump deps 2020-08-12 15:52:29 -06:00
DirtyRacer1337
6ac8955715 Add tests 2020-08-12 22:20:31 +07:00
dependabot[bot]
4fd2b7a879
Bump Microsoft.NET.Test.Sdk from 16.6.1 to 16.7.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.6.1 to 16.7.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.6.1...v16.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-10 12:01:45 +00:00
crobibero
fffa94fc33 Apply fixes from review 2020-08-06 08:17:45 -06:00
crobibero
2b7cefdf15 Remove references to MediaBrowser.Api 2020-08-04 08:42:09 -06:00
crobibero
9e00aa3014 fix openapi validation errors 2020-08-03 14:38:51 -06:00
crobibero
f915c3e5d9 Merge remote-tracking branch 'upstream/master' into api-migration 2020-08-03 11:24:13 -06:00
Odd Stråbø
7fa80ac3e0 Add more tests, update comment 2020-07-26 23:03:16 +02:00
Odd Stråbø
11d5410dbb Don't ignore dot directories. 
Use `.ignore` file to hide directory from library scan.

Also, please tell me we handle sample matching somewhere else? This is a mess.
 2020-07-25 23:50:49 +02:00
crobibero
1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
Patrick Barron
4742ddbb71 Update .NET Core to 3.1.6 2020-07-17 19:48:11 -04:00
dkanada
87d7c4a62e
Merge pull request #3500 from nyanmisaka/vpp-qsv 
Add FFmpeg 4.3 detection and solve the green line on QSV HWA
 2020-07-14 20:31:13 +09:00
dependabot[bot]
aefe011d7d
Bump AutoFixture from 4.12.0 to 4.13.0 
Bumps [AutoFixture](https://github.com/AutoFixture/AutoFixture) from 4.12.0 to 4.13.0.
- [Release notes](https://github.com/AutoFixture/AutoFixture/releases)
- [Commits](https://github.com/AutoFixture/AutoFixture/compare/v4.12.0...v4.13.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-13 12:04:07 +00:00
dependabot[bot]
88d06aa156
Bump Moq from 4.14.4 to 4.14.5 
Bumps [Moq](https://github.com/moq/moq4) from 4.14.4 to 4.14.5.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.14.4...v4.14.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-06 12:02:46 +00:00
nyanmisaka
f5c5352861 add FFmpeg 4.3 detection and tests 2020-07-04 19:14:49 +08:00
Max Git
3588ee5229 Merge branch 'master' into feature/ffmpeg-version-check 2020-07-02 23:50:13 +02:00
dependabot[bot]
248a2d61dd
Bump Moq from 4.14.3 to 4.14.4 
Bumps [Moq](https://github.com/moq/moq4) from 4.14.3 to 4.14.4.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.14.3...v4.14.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-30 02:20:44 +00:00
crobibero
80b43fb805 bump autofixture 2020-06-29 07:27:15 -06:00
dependabot[bot]
4e2115cd83
Bump AutoFixture from 4.11.0 to 4.12.0 
Bumps [AutoFixture](https://github.com/AutoFixture/AutoFixture) from 4.11.0 to 4.12.0.
- [Release notes](https://github.com/AutoFixture/AutoFixture/releases)
- [Commits](https://github.com/AutoFixture/AutoFixture/compare/v4.11.0...v4.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-29 12:24:58 +00:00
crobibero
9772749d8f Add more ignorepatterns and tests 2020-06-26 11:04:35 -06:00
Max Git
c35c401d65 Merge branch 'master' into feature/ffmpeg-version-check 2020-06-23 09:20:50 +02:00
crobibero
1d7d480efe fix tests 2020-06-22 08:14:07 -06:00
dependabot[bot]
3e57898d6b
Bump Moq from 4.14.1 to 4.14.3 
Bumps [Moq](https://github.com/moq/moq4) from 4.14.1 to 4.14.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.14.1...v4.14.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-22 12:01:53 +00:00
David
82c1da34be Fix tests 2020-06-20 18:29:29 +02:00
crobibero
29917699f0 Further cleanup and add final tests 2020-06-16 16:55:02 -06:00
crobibero
b22fdbf59e Add tests and cleanup 2020-06-16 16:42:10 -06:00
crobibero
774fdbd031 Fix tests. 2020-06-16 14:12:40 -06:00
Max Git
a57d664c7d Merge branch 'master' into feature/ffmpeg-version-check 2020-06-16 00:53:10 +02:00
dependabot[bot]
979137f567
Bump coverlet.collector from 1.2.1 to 1.3.0 
Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 1.2.1 to 1.3.0.
- [Release notes](https://github.com/coverlet-coverage/coverlet/releases)
- [Commits](https://github.com/coverlet-coverage/coverlet/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-15 12:01:24 +00:00
Max Git
3fbc387257 Fix stylecop error like on master. 2020-06-15 12:15:05 +02:00
Max Git
37e737e012 Merge from master & fix conflict 2020-06-15 12:12:03 +02:00
crobibero
589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06:00
dkanada
155ee5ee9d
Merge pull request #3329 from telans/code-analyzer-tests 
Enable code analyzers for tests
 2020-06-15 10:50:08 +09:00
telans
4cb8fbfbbf
fix StyleCop warning in Jellyfin.MediaEncoding.Tests 2020-06-14 18:56:47 +12:00
Patrick Barron
42b4f0aa2e Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
 2020-06-13 19:41:05 -04:00
crobibero
829eb1a849 merge master into api-migration 2020-06-13 13:03:09 -06:00
telans
bf5b21e67b
enable code analyzers for tests 2020-06-13 23:37:41 +12:00
Patrick Barron
7a115024aa Merge branch 'master' into userdb-efcore 
# Conflicts:
#	MediaBrowser.Controller/Library/ILibraryManager.cs
#	MediaBrowser.Providers/Users/UserMetadataService.cs
 2020-06-11 18:23:12 -04:00
Cody Robibero
17ffb689e0
Merge branch 'master' into update-dotnet-core 2020-06-11 07:16:45 -06:00
crobibero
a6815018dc Update to .NET Core 3.1.5 2020-06-11 07:13:56 -06:00
Max Git
620a1a106d Merge branch 'master' into feature/ffmpeg-version-check 2020-06-11 14:50:29 +02:00
dkanada
4ef459033f
Merge pull request #3294 from jellyfin/dependabot/nuget/Microsoft.NET.Test.Sdk-16.6.1 
Bump Microsoft.NET.Test.Sdk from 16.5.0 to 16.6.1
 2020-06-11 21:17:03 +09:00
dependabot[bot]
98a0bfc505
Bump Moq from 4.13.1 to 4.14.1 
Bumps [Moq](https://github.com/moq/moq4) from 4.13.1 to 4.14.1.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.13.1...v4.14.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-11 10:30:20 +00:00
dependabot[bot]
a4de0bb373
Bump Microsoft.NET.Test.Sdk from 16.5.0 to 16.6.1 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.5.0 to 16.6.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.5.0...v16.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-11 10:30:13 +00:00
Erik Rigtorp
82ff3fa75d Add additional resolver tests 2020-06-08 16:35:20 -07:00
crobibero
2476848dd3 Fix tests 2020-06-02 10:12:55 -06:00
Max Git
e103d087d3 Try harder at detecting FFmpeg version and enable the validation 2020-06-01 07:10:15 +02:00
Patrick Barron
01ce56016a Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
#	MediaBrowser.Api/UserService.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
 2020-05-26 20:29:11 -04:00
Patrick Barron
c464f700db Remove redundant qualifiers 2020-05-20 13:07:53 -04:00
Vasily
2d2c1d9473
Merge pull request #3099 from rigtorp/ignore-patterns 
Use glob patterns to ignore files
 2020-05-18 22:23:40 +03:00
Mark Monteiro
3ed76d7e08 Update to .NET Core 3.1.4 2020-05-17 13:33:38 -04:00
Erik Rigtorp
f144acdc96 Use glob patterns to ignore files 2020-05-15 18:33:18 -07:00
aled
3ff6e3ff65 Add code analyzers to Jellyfin.Naming.Tests and fix resulting warnings 2020-05-14 18:59:10 +01:00
aled
2849d2b134 Fix compile warnings in Jellyfin.Naming.Tests 2020-05-13 23:59:19 +01:00
Patrick Barron
c1360a1dc3 Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Entities/User.cs
#	Jellyfin.Data/ISavingChanges.cs
#	Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
#	Jellyfin.Server.Implementations/JellyfinDb.cs
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Model/Notifications/NotificationOptions.cs
#	MediaBrowser.sln
 2020-05-12 22:22:20 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Bond-009
ca2f9c7341
Merge pull request #2945 from mark-monteiro/integration-tests 
Add Integration Tests For BrandingService
 2020-05-04 19:01:02 +02:00