Anthony Lavado
|
cf9223b8cb
|
Merge pull request #3340 from crobibero/api-migration-merge
Merge master into api-migration
|
4 years ago |
crobibero
|
524243a934
|
fix merge conflict
|
4 years ago |
|
crobibero
|
589735f60c
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
4 years ago |
dkanada
|
f026a1d721
|
Merge pull request #3267 from pusta/Contributors-Update
CONTRIBUTORS.md - Updated jellyfin-server-windows to compile against .Net Core 3.1
|
4 years ago |
|
dkanada
|
6db1878011
|
Merge pull request #3315 from crobibero/dashboard-update
Add MessageId to websocket message, fix ws exception
|
4 years ago |
|
dkanada
|
e2b2f74b47
|
Merge pull request #3319 from Ullmie02/api-204
Use Http status code 204 instead of 200
|
4 years ago |
|
dkanada
|
155ee5ee9d
|
Merge pull request #3329 from telans/code-analyzer-tests
Enable code analyzers for tests
|
4 years ago |
|
dkanada
|
4f2ae5c9e1
|
Merge pull request #3158 from Artiume/patch-5
Update Library Service
|
4 years ago |
Patrick Barron
|
293187480f
|
Merge pull request #3288 from Ullmie02/api-subtitles
Move SubtitleService to Jellyfin.Api
|
4 years ago |
telans
|
8620dfc18b
|
remove symlink
|
4 years ago |
|
telans
|
afc9224ede
|
fix SA1111
|
4 years ago |
|
telans
|
9b528aabc2
|
misc
|
4 years ago |
|
telans
|
3d9049ef08
|
fix SA1508
|
4 years ago |
|
telans
|
acd4389653
|
fix SA1005
|
4 years ago |
|
telans
|
726e116d5b
|
fix SA1510
|
4 years ago |
|
Anthony Lavado
|
15aea76523
|
Merge pull request #3148 from barronpm/userdb-efcore
Migrate User DB to EF Core
|
4 years ago |
David
|
edc5611ec7
|
Fix null reference to fix CI
|
4 years ago |
|
David
|
8a8bf4b686
|
Merge remote-tracking branch 'upstream/api-migration' into api-sessionservice
|
4 years ago |
|
David
|
ac0a3180d7
|
Merge remote-tracking branch 'upstream/api-migration' into api-librarystructure
|
4 years ago |
|
David
|
9bedd9ac3c
|
Merge remote-tracking branch 'upstream/api-migration' into api-204
|
4 years ago |
|
David
|
d01f56bc42
|
Merge remote-tracking branch 'upstream/api-migration' into api-subtitles
|
4 years ago |
|
David
|
cf3d0f8d51
|
Merge remote-tracking branch 'remotes/upstream/api-migration' into api-system
|
4 years ago |
|
telans
|
4cb8fbfbbf
|
fix StyleCop warning in Jellyfin.MediaEncoding.Tests
|
4 years ago |
|
crobibero
|
7b54a43cc1
|
Fix docs typo
|
4 years ago |
|
crobibero
|
14f32b4927
|
Remove warnings from MediaBrowser.LocalMetadata
|
4 years ago |
Patrick Barron
|
42b4f0aa2e
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
|
4 years ago |
|
Patrick Barron
|
e8f8307521
|
Add comment
|
4 years ago |
|
Patrick Barron
|
6f325fea61
|
Add missing properties to UserDto
|
4 years ago |
|
Patrick Barron
|
8405ae9b1f
|
Actually set `BlockUnratedItems`
|
4 years ago |
|
Patrick Barron
|
aa4ac5902e
|
Fix concurrency exception
|
4 years ago |
|
crobibero
|
276750f310
|
Move ItemRefreshService.cs to Jellyfin.Api
|
4 years ago |
|
crobibero
|
13b53db4ef
|
fix build
|
4 years ago |
|
crobibero
|
2d4998c578
|
fix build
|
4 years ago |
|
crobibero
|
ae514da840
|
Merge remote-tracking branch 'upstream/api-migration' into api-environment
|
4 years ago |
|
crobibero
|
8a834fb728
|
Merge remote-tracking branch 'upstream/api-migration' into api-filter
|
4 years ago |
|
crobibero
|
81030a0a5a
|
Merge remote-tracking branch 'upstream/api-migration' into api-plugin
|
4 years ago |
|
crobibero
|
ce37c40749
|
Merge remote-tracking branch 'upstream/api-migration' into api-item-lookup
|
4 years ago |
|
crobibero
|
50f6d8029d
|
Merge remote-tracking branch 'upstream/api-migration' into api-item-update
|
4 years ago |
|
crobibero
|
9ee6ea86ea
|
Merge remote-tracking branch 'upstream/api-migration' into api-localization
|
4 years ago |
|
crobibero
|
bcce8190ff
|
Merge remote-tracking branch 'upstream/api-migration' into api-channel
|
4 years ago |
|
crobibero
|
3c18745f53
|
Remove RemoteImageService.cs
|
4 years ago |
|
crobibero
|
552a74eb6e
|
Fix build
|
4 years ago |
|
crobibero
|
6c7cc92a09
|
Merge remote-tracking branch 'upstream/api-migration' into api-image2
|
4 years ago |
|
crobibero
|
bd09753976
|
Merge remote-tracking branch 'upstream/api-migration' into api-image
|
4 years ago |
|
crobibero
|
39376bace3
|
Merge remote-tracking branch 'upstream/api-migration' into api-scheduled-tasks
|
4 years ago |
|
crobibero
|
7666a1201f
|
Merge remote-tracking branch 'upstream/api-migration' into api-display-preferences
|
4 years ago |
|
Patrick Barron
|
3278015444
|
Actually fix profile images
|
4 years ago |
Joshua M. Boniface
|
0011e8df47
|
Merge pull request #3332 from crobibero/api-migration
Merge master into api-migration
|
4 years ago |
Chris Kapusta
|
b8d80bf09c
|
Update CONTRIBUTORS.md
Co-authored-by: Bond-009 <bond.009@outlook.com>
|
4 years ago |
|
crobibero
|
ec3e15db57
|
Fix merge and build
|
4 years ago |
