Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-07 18:24:19 -04:00
Code Issues Packages Projects Releases Wiki Activity
18,667 Commits 17 Branches 89 Tags
Commit Graph

18667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
b0093fbce4
Bump CommandLineParser from 2.7.82 to 2.8.0 
Bumps [CommandLineParser](https://github.com/commandlineparser/commandline) from 2.7.82 to 2.8.0.
- [Release notes](https://github.com/commandlineparser/commandline/releases)
- [Changelog](https://github.com/commandlineparser/commandline/blob/master/CHANGELOG.md)
- [Commits](https://github.com/commandlineparser/commandline/commits/2.8.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-15 12:01:32 +00:00
dependabot[bot]
95884752de
Bump Swashbuckle.AspNetCore from 5.0.0 to 5.4.1 
Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 5.0.0 to 5.4.1.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v5.0.0...v5.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-15 12:01:29 +00: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
dependabot[bot]
c243ec7ce9
Bump PlaylistsNET from 1.0.4 to 1.0.6 
Bumps [PlaylistsNET](https://github.com/tmk907/PlaylistsNET) from 1.0.4 to 1.0.6.
- [Release notes](https://github.com/tmk907/PlaylistsNET/releases)
- [Commits](https://github.com/tmk907/PlaylistsNET/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-15 12:01:17 +00:00
dkanada
dabb869a6b
Merge branch 'master' into hwaccel 2020-06-15 20:21:25 +09: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
BaronGreenback
6d6793151a Null pointer check added for subscription as 2nd param is false. 2020-06-15 10:10:52 +01:00
BaronGreenback
862bcdba67
Merge pull request #23 from jellyfin/master 
updating
 2020-06-15 10:01:55 +01:00
Anthony Lavado
100e9d586d
Merge pull request #3336 from telans/specific-fixes 
Fix trivial SA1005, SA1111, SA1508, SA1510 warnings
 2020-06-14 22:51:29 -04:00
Anthony Lavado
cf9223b8cb
Merge pull request #3340 from crobibero/api-migration-merge 
Merge master into api-migration
 2020-06-14 22:50:49 -04:00
crobibero
524243a934 fix merge conflict 2020-06-14 20:18:06 -06:00
crobibero
589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06:00
dkanada
f026a1d721
Merge pull request #3267 from pusta/Contributors-Update 
CONTRIBUTORS.md - Updated jellyfin-server-windows to compile against .Net Core 3.1
 2020-06-15 10:57:13 +09:00
dkanada
6db1878011
Merge pull request #3315 from crobibero/dashboard-update 
Add MessageId to websocket message, fix ws exception
 2020-06-15 10:55:33 +09:00
dkanada
e2b2f74b47
Merge pull request #3319 from Ullmie02/api-204 
Use Http status code 204 instead of 200
 2020-06-15 10:51:28 +09: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
dkanada
4f2ae5c9e1
Merge pull request #3158 from Artiume/patch-5 
Update Library Service
 2020-06-15 10:46:54 +09:00
Patrick Barron
293187480f
Merge pull request #3288 from Ullmie02/api-subtitles 
Move SubtitleService to Jellyfin.Api
 2020-06-14 19:06:01 -04:00
telans
8620dfc18b
remove symlink 2020-06-15 10:46:44 +12:00
telans
afc9224ede
fix SA1111 2020-06-15 10:46:43 +12:00
telans
9b528aabc2
misc 2020-06-15 10:45:59 +12:00
telans
3d9049ef08
fix SA1508 2020-06-15 10:45:55 +12:00
telans
acd4389653
fix SA1005 2020-06-15 10:41:00 +12:00
telans
726e116d5b
fix SA1510 2020-06-15 10:40:57 +12:00
Anthony Lavado
15aea76523
Merge pull request #3148 from barronpm/userdb-efcore 
Migrate User DB to EF Core
 2020-06-14 18:31:27 -04:00
David
edc5611ec7 Fix null reference to fix CI 2020-06-14 13:50:51 +02:00
David
8a8bf4b686 Merge remote-tracking branch 'upstream/api-migration' into api-sessionservice 2020-06-14 12:49:43 +02:00
David
ac0a3180d7 Merge remote-tracking branch 'upstream/api-migration' into api-librarystructure 2020-06-14 12:49:19 +02:00
David
9bedd9ac3c Merge remote-tracking branch 'upstream/api-migration' into api-204 2020-06-14 12:48:17 +02:00
David
d01f56bc42 Merge remote-tracking branch 'upstream/api-migration' into api-subtitles 2020-06-14 12:45:49 +02:00
David
cf3d0f8d51 Merge remote-tracking branch 'remotes/upstream/api-migration' into api-system 2020-06-14 12:43:10 +02:00
telans
4cb8fbfbbf
fix StyleCop warning in Jellyfin.MediaEncoding.Tests 2020-06-14 18:56:47 +12:00
crobibero
7b54a43cc1 Fix docs typo 2020-06-13 20:15:19 -06:00
crobibero
14f32b4927 Remove warnings from MediaBrowser.LocalMetadata 2020-06-13 20:04:53 -06: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
Patrick Barron
e8f8307521 Add comment 2020-06-13 19:30:45 -04:00
Patrick Barron
6f325fea61 Add missing properties to UserDto 2020-06-13 18:26:46 -04:00
Patrick Barron
8405ae9b1f Actually set BlockUnratedItems 2020-06-13 18:23:13 -04:00
Patrick Barron
aa4ac5902e Fix concurrency exception 2020-06-13 18:08:17 -04:00
crobibero
276750f310 Move ItemRefreshService.cs to Jellyfin.Api 2020-06-13 15:33:42 -06:00
crobibero
13b53db4ef fix build 2020-06-13 15:31:22 -06:00
crobibero
2d4998c578 fix build 2020-06-13 15:28:04 -06:00
crobibero
ae514da840 Merge remote-tracking branch 'upstream/api-migration' into api-environment 2020-06-13 15:27:03 -06:00
crobibero
8a834fb728 Merge remote-tracking branch 'upstream/api-migration' into api-filter 2020-06-13 15:25:02 -06:00
crobibero
81030a0a5a Merge remote-tracking branch 'upstream/api-migration' into api-plugin 2020-06-13 15:24:34 -06:00
crobibero
ce37c40749 Merge remote-tracking branch 'upstream/api-migration' into api-item-lookup 2020-06-13 15:23:42 -06:00
crobibero
50f6d8029d Merge remote-tracking branch 'upstream/api-migration' into api-item-update 2020-06-13 15:21:50 -06:00
crobibero
9ee6ea86ea Merge remote-tracking branch 'upstream/api-migration' into api-localization 2020-06-13 15:21:13 -06:00
crobibero
bcce8190ff Merge remote-tracking branch 'upstream/api-migration' into api-channel 2020-06-13 15:20:13 -06:00