pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,511 Commits 30 Branches 75 Tags 1.3 GiB
Commit Graph

16511 Commits

Author SHA1 Message Date
Patrick Barron 1da044e0eb
Merge pull request #3369 from crobibero/api-cleanup 
Remove #nullable, make Task.Run async
 2020-06-18 13:22:52 +00:00
crobibero 9a51f484af Remove nullable, add async task 2020-06-18 07:11:46 -06:00
Patrick Barron 116284fe99
Merge pull request #3321 from Ullmie02/api-librarystructure 
Move LibraryStructureService to Jellyfin.Api
 2020-06-17 23:27:47 +00:00
Patrick Barron b4da357db2
Merge pull request #2944 from crobibero/api-image 
ImageNameService to Jellyfin.Api
 2020-06-17 17:15:32 +00:00
David 226a9d5d2e
Merge pull request #2946 from crobibero/api-image2 
Move RemoteImageService to Jellyfin.API
 2020-06-17 19:07:20 +02:00
David bf133d044a
Merge pull request #3269 from crobibero/api-filter 
Move FilterService to Jellyfin.Api
 2020-06-17 18:53:03 +02:00
crobibero 9b45ee440c User proper File constructor 2020-06-17 10:51:50 -06:00
crobibero 0d1298e851 User proper File constructor 2020-06-17 10:49:34 -06:00
crobibero 90fe8f0cbc Merge branch 'api-filter' of github.com:crobibero/jellyfin into api-filter 2020-06-17 10:43:26 -06:00
crobibero 444605703c Merge remote-tracking branch 'upstream/api-migration' into api-filter 2020-06-17 10:43:04 -06:00
Cody Robibero f181cb3746
Update Jellyfin.Api/Controllers/FilterController.cs 
Co-authored-by: David <davidullmer@outlook.de>
 2020-06-17 10:41:40 -06:00
Cody Robibero f27f977f01
Merge pull request #3333 from crobibero/api-item-refresh 
Move ItemRefreshService.cs to Jellyfin.Api
 2020-06-17 09:12:41 -06:00
Cody Robibero 5a7ad6b2dc
Merge pull request #3274 from crobibero/api-localization 
Move LocalizationService to Jellyfin.Api
 2020-06-17 09:12:33 -06:00
David efe998ecf4
Merge pull request #3280 from crobibero/api-plugin 
Move PluginService to Jellyfin.Api
 2020-06-17 17:07:37 +02:00
David a952d15670 Await Task from _libraryManager 2020-06-16 16:08:31 +02: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
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 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
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
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 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 9ee6ea86ea Merge remote-tracking branch 'upstream/api-migration' into api-localization 2020-06-13 15:21:13 -06:00
crobibero 3c18745f53 Remove RemoteImageService.cs 2020-06-13 15:15:27 -06:00
crobibero 552a74eb6e Fix build 2020-06-13 15:13:57 -06:00
crobibero 6c7cc92a09 Merge remote-tracking branch 'upstream/api-migration' into api-image2 2020-06-13 15:09:02 -06:00
crobibero bd09753976 Merge remote-tracking branch 'upstream/api-migration' into api-image 2020-06-13 15:07:04 -06:00
Patrick Barron 3278015444 Actually fix profile images 2020-06-13 16:38:17 -04:00
Joshua M. Boniface 0011e8df47
Merge pull request #3332 from crobibero/api-migration 
Merge master into api-migration
 2020-06-13 16:28:37 -04:00
Chris Kapusta b8d80bf09c
Update CONTRIBUTORS.md 
Co-authored-by: Bond-009 <bond.009@outlook.com>
 2020-06-13 14:32:42 -05:00
crobibero ec3e15db57 Fix merge and build 2020-06-13 13:11:41 -06:00
crobibero 829eb1a849 merge master into api-migration 2020-06-13 13:03:09 -06:00
Patrick Barron 1e1386bbc6 Fix build issues 2020-06-13 11:59:19 -04:00
Patrick Barron 84f0cf6cc6 Regenerate migrations 2020-06-13 11:56:18 -04:00