lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,534 Commits 2 Branches 0 Tags 64 MiB
5282a5c8c2
Commit Graph

17534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
crobibero
393666efcf fix merge conflicts 2020-08-04 20:30:45 -06:00
crobibero
e65ecb5687 Merge remote-tracking branch 'upstream/master' into api-merge-again 2020-08-04 20:29:06 -06:00
Anthony Lavado
c12a49361c
Merge pull request #3820 from Bond-009/warn22 
Fix some warnings
 2020-08-04 17:35:50 -07:00
Anthony Lavado
da14c306b8
Merge pull request #3809 from Bond-009/minor4 
Minor improvements
 2020-08-04 17:35:12 -07:00
Anthony Lavado
c2799fe4d3
Merge pull request #3784 from barronpm/add-sync 
Minor fixes to ActivityManager
 2020-08-04 17:34:56 -07:00
Anthony Lavado
c5bc046c40
Merge pull request #3782 from Bond-009/websocket2 
Minor fixes for websocket code
 2020-08-04 17:34:14 -07:00
Patrick Barron
5c65abcd94 Clean up TunerHost classes 2020-08-04 18:58:14 -04:00
Patrick Barron
ff4489575b
Merge pull request #3819 from crobibero/api-migration-cleanup 
Api migration cleanup
 2020-08-04 22:28:52 +00:00
Joshua M. Boniface
560a099473
Merge pull request #3822 from jellyfin/EraYaN-artifact-collection 
Merge the args and commands item for the artifact collection
 2020-08-04 16:42:45 -04:00
Erwin de Haan
25daa7db42
Merge the args and commands item for the artifact collection 2020-08-04 22:35:23 +02:00
crobibero
858aecd409 Fix all route for base url support 2020-08-04 12:48:53 -06:00
Bond-009
7368cbbd2f
Merge pull request #3774 from jellyfin/ci-CollectArtifacts-timeout 
Add a much shorter timeout to the CollectArtifacts job
 2020-08-04 19:58:20 +02:00
Bond-009
d9f6953416 Minor fixes 2020-08-04 17:14:07 +02:00
Bond-009
53f99d5d4b Add some analyzers to MediaBrowser.MediaEncoding 2020-08-04 17:08:09 +02:00
crobibero
2b7cefdf15 Remove references to MediaBrowser.Api 2020-08-04 08:42:09 -06:00
crobibero
e1226f12f2 fix attribute ordering 2020-08-04 08:30:03 -06:00
crobibero
8f6c2e7679 Remove leading slash from route attributes 2020-08-04 08:27:54 -06:00
Bond-009
18efa25a6f Enable TreatWarningsAsErrors for MediaBrowser.MediaEncoding 2020-08-04 16:20:52 +02:00
Bond-009
237cb4e383
Merge pull request #3816 from cvium/onrefresh_logging 
Change OnRefreshStart and OnRefreshComplete logging levels to debug
 2020-08-04 11:30:10 +02:00
cvium
52d409101b Change OnRefreshStart and OnRefreshComplete logging levels to debug 2020-08-04 09:05:51 +02:00
Anthony Lavado
b7f3906446
Merge pull request #3806 from jellyfin/dkanada-patch-1 
Disable compatibility checks for now
 2020-08-03 15:14:22 -07:00
Patrick Barron
8385c54591
Merge pull request #3811 from crobibero/api-cleanup 
Clean up api-migration branch
 2020-08-03 21:45:15 +00:00
crobibero
dee7bdddb6 fix build 2020-08-03 14:49:24 -06:00
crobibero
e64924f4d3 actually remove MediaBrowser.Api 2020-08-03 14:42:46 -06:00
crobibero
9e00aa3014 fix openapi validation errors 2020-08-03 14:38:51 -06:00
crobibero
1535f363b2 Fix some request parameters 2020-08-03 13:33:43 -06:00
crobibero
8bb510a9f6 Specify Logger type 2020-08-03 13:16:29 -06:00
crobibero
0f32beb75f Properly use DI to reference other controllers. 2020-08-03 13:15:21 -06:00
crobibero
db36b9d501 Delete MediaBrowser.Api 2020-08-03 13:09:49 -06:00
crobibero
cfce1dba08 move WebSocket listeners to Jellyfin.Api 2020-08-03 13:09:32 -06:00
Alf Sebastian Houge
676f000286 Remove comments from json file in .vscode/launch.json 2020-08-03 20:45:50 +02:00
Bond_009
4980db1594 Fix spelling 2020-08-03 20:42:01 +02:00
dkanada
b9d1d1c6b5
Merge pull request #3801 from michael9dk/patch-1 
Update README.md (fix broken links)
 2020-08-04 03:37:00 +09:00
Bond_009
2b355c36ff Minor improvements 
OFC I reduced some allocations
 2020-08-03 20:32:45 +02:00
Alf Sebastian Houge
b2badb9906 Fix links in README and note about setup wizard 
Fix some of the web client links in the README and add a note about
hosting the web client seperately, and how the setup wizard can only be
run if the web client is not hosted separate
 2020-08-03 20:28:01 +02:00
Alf Sebastian Houge
d53f7dd0c2 Add vscode launch configuration for launching without hosting webclient 2020-08-03 20:27:22 +02:00
David
a28d00eeba
Merge pull request #3808 from crobibero/api-migration-merge 
Merge master into api-migration
 2020-08-03 20:22:21 +02:00
crobibero
dbeeb7cf4a fix merge conflicts 2020-08-03 12:01:24 -06:00
crobibero
f915c3e5d9 Merge remote-tracking branch 'upstream/master' into api-migration 2020-08-03 11:24:13 -06:00
Patrick Barron
6a42a48c09
Merge pull request #3528 from Ullmie02/api-entrypoint 
Make TranscodingJobHelper an IDisposable (api-migration)
 2020-08-03 17:11:24 +00:00
Patrick Barron
cd515bdbfd
Merge pull request #3783 from Ullmie02/api-universal-audio 
Move UniversalAudioService to Jellyfin.Api
 2020-08-03 17:09:18 +00:00
Patrick Barron
3a0bccb941
Merge pull request #2957 from crobibero/api-dlna-server 
Migrate DlnaServerController to Jellyfin.Api
 2020-08-03 17:00:46 +00:00
Patrick Barron
97c95d3a6b
Merge pull request #2956 from crobibero/api-dlna 
Move Emby.Dlna DlnaService.cs to Jellyfin.Api
 2020-08-03 16:59:44 +00:00
dkanada
b4c6ae9aba
disable compatibility checks for now 2020-08-04 01:02:02 +09:00
Bond-009
5b4863c65b
Merge pull request #3803 from jellyfin/dependabot/nuget/sharpcompress-0.26.0 
Bump sharpcompress from 0.25.1 to 0.26.0
 2020-08-03 15:36:46 +02:00
dependabot[bot]
d09fb5c535
Bump sharpcompress from 0.25.1 to 0.26.0 
Bumps [sharpcompress](https://github.com/adamhathcock/sharpcompress) from 0.25.1 to 0.26.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.25.1...0.26)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-03 13:22:11 +00:00
Bond-009
3b49ed1b37
Merge pull request #3802 from jellyfin/dependabot/nuget/PlaylistsNET-1.1.2 
Bump PlaylistsNET from 1.0.6 to 1.1.2
 2020-08-03 15:05:00 +02:00
Bond-009
e3f6ef6080
Merge pull request #3804 from jellyfin/dependabot/nuget/Serilog.AspNetCore-3.4.0 
Bump Serilog.AspNetCore from 3.2.0 to 3.4.0
 2020-08-03 15:04:10 +02:00
Bond-009
4a11a9b879
Merge pull request #3805 from jellyfin/dependabot/nuget/Mono.Nat-2.0.2 
Bump Mono.Nat from 2.0.1 to 2.0.2
 2020-08-03 15:03:24 +02:00
dependabot[bot]
96817fca07
Bump Mono.Nat from 2.0.1 to 2.0.2 
Bumps [Mono.Nat](https://github.com/mono/Mono.Nat) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/mono/Mono.Nat/releases)
- [Commits](https://github.com/mono/Mono.Nat/compare/Mono.Nat-2.0.1...release-v2.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-08-03 12:04:27 +00:00