lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,686 Commits 2 Branches 0 Tags 64 MiB
d1a0497f55
Commit Graph

12686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erwin de Haan
d1a0497f55 Revert "Merge pull request #452 from Bond-009/activitydb" 
This reverts commit 48ad18d12b, reversing
changes made to fe197415ca.
 2019-01-25 23:32:06 +01:00
Andrew Rabert
e0315b5695
Merge pull request #702 from jellyfin/win-build 
Fix debug build on windows
 2019-01-25 08:36:21 -05:00
Bond-009
fd36bbede8
Fix debug build on windows 2019-01-25 12:42:45 +01:00
Andrew Rabert
b4fdfb562d Merge pull request #700 from jellyfin/dev 
Dev sync
 2019-01-24 23:03:54 -05:00
Andrew Rabert
48ad18d12b Merge pull request #452 from Bond-009/activitydb 
Use EF Core for Activity database
 2019-01-24 23:02:20 -05:00
Andrew Rabert
fe197415ca Merge pull request #657 from Bond-009/true 
Remove conditions that are always true/false
 2019-01-24 23:02:10 -05:00
Andrew Rabert
0231bd88a7 Merge pull request #672 from cvium/kill_unconditional_caching 
Remove unconditional caching, modified since header and use ETags
 2019-01-24 23:01:52 -05:00
Andrew Rabert
15806de2aa Merge pull request #681 from LogicalPhallacy/buildscriptfix 
Fix Windows build script errors + pin ffmpeg to 4.0
 2019-01-24 23:01:20 -05:00
Andrew Rabert
68a7ed6b7c Merge pull request #687 from Bond-009/stylecop 
Fix some analyzer warnings
 2019-01-24 23:01:07 -05:00
Andrew Rabert
48e1a55d9e Merge pull request #689 from Wuerfelbecher/fix-fedora-build 
Fix RPM package build for fedora
 2019-01-24 23:00:51 -05:00
Andrew Rabert
2c9e056d52 Merge pull request #699 from jellyfin/dev 
Dev sync
 2019-01-24 22:57:44 -05:00
Bond_009
8191efb90c Fix some analyzer warnings 
Some changes:
* Don't omit braces
* Fix culture sensitive string compare
* Define accessibility functions

I restricted myself to these 5 files, for now :p
 2019-01-24 20:14:19 +01:00
Joshua M. Boniface
1d7d4c5738 Merge pull request #686 from Bond-009/analyzers 
Disable some StyleCop warnings
 2019-01-24 14:07:01 -05:00
hawken
3701ce4037 Eliminate some compile warnings (#600) 
* Remove some unused variables
* remove duplicate "using .." by sorting and deduping the list
* Remove things that already exist in the parent class (in one case I moved some documentation to the parent)
* EntityBodyData and and NextSearch were never set (only read), removed
* _timeout was never read, subsequently _timer became unused. part of a TODO timeout functionality that was not implemented yet
 2019-01-24 18:56:43 +01:00
Claus Vium
b2ffad9ce9 Set Parent to current query Item if ParentId is empty (#680) 
**Changes**
Fixed a faulty change in logic that occurred during the Christmas GPL nightmare.

I stepped through Emby 3.5.2 and stumbled over a difference in the query between Jellyfin and Emby, where in Emby, query.ParentId was set to the item itself. So I did a little digging in the old GPLv2 source and found this https://github.com/MediaBrowser/Emby/blob/3.4.1.8/MediaBrowser.Controller/Entities/Folder.cs#L720

**Issues**
Fixes #673
 2019-01-24 18:48:37 +01:00
Vasily
f4015f82e0 Update jellyfin.ruleset 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-01-24 18:39:51 +01:00
Phallacy
cab7fa2671 added self to contributors list 2019-01-24 07:36:45 -08:00
Thomas Büttner
6a3ed5d519 Added macOS to the docker sudo exception 2019-01-24 16:24:00 +01:00
Thomas Büttner
f2d0d1f646 Make the docker group check BSD compatible 2019-01-24 15:24:04 +01:00
Phallacy
d6a729c119 parameterized ffmpeg and nssm stuff 2019-01-24 01:56:56 -08:00
Phallacy
4e7675e78f Updated Packaging Windows from Linux for parity 2019-01-24 01:42:34 -08:00
Bond_009
b6f5c33191 Disable SA1633 2019-01-23 23:51:46 +01:00
Bond_009
1cbcddfbd2 Disable SA1309 2019-01-23 23:30:38 +01:00
Bond_009
80d011bb4f Disable SA1200 2019-01-23 23:30:03 +01:00
Bond-009
59ff083f5d Add comment 2019-01-23 23:21:55 +01:00
Thomas Büttner
cc3b1e5cc8 Fix package build for fedora 2019-01-23 21:14:10 +01:00
Bond_009
58591da0b8 Disable warning for calling local function without this. prefixed 2019-01-23 19:17:45 +01:00
Bond_009
905a253ff5 Suffix async methods with Async 2019-01-23 19:09:34 +01:00
Bond_009
3cd31cadf8 No need to check if the dir exists 2019-01-23 18:34:34 +01:00
Bond_009
48da8f429e Return a true IEnumerable 2019-01-23 18:34:34 +01:00
Bond_009
8d9428ebdc Ensure DB exists 2019-01-23 18:34:34 +01:00
Bond_009
f6f0a8a481 Use EF Core for Activity database 2019-01-23 16:39:12 +01:00
Phallacy
a30687a15a Quick fix to erroring build scripts and pulling the supported ffmpeg 2019-01-23 00:41:38 -08:00
LogicalPhallacy
404bd04cbc Merge pull request #8 from jellyfin/master 
rebase to latest master
 2019-01-23 00:31:35 -08:00
Andrew Rabert
bd550ef996 Fix arm32 Docker 2019-01-22 20:25:41 -05:00
Andrew Rabert
e05e002b8b Merge pull request #677 from nvllsvm/fixdocker 
Fix arm32 Docker
 2019-01-22 20:11:30 -05:00
Andrew Rabert
ede0439b12 Fix arm32 Docker 2019-01-22 20:04:40 -05:00
Andrew Rabert
becbad981c Merge pull request #535 from Bond-009/streambuilder 
Clean up streambuilder
 2019-01-22 19:40:59 -05:00
Andrew Rabert
3d01aa1ae4 Merge pull request #656 from hawken93/more_logging 
Do some logging in MediaInfoService
 2019-01-22 19:38:43 -05:00
Joshua M. Boniface
0fec7994a8 Merge pull request #663 from nvllsvm/tl 
Use TagLibSharp Nuget package
 2019-01-22 19:35:09 -05:00
Andrew Rabert
090fea21ea Merge pull request #668 from hawken93/prepare_for_reports_module 
Return Audio objects from MusicAlbum.Tracks
 2019-01-22 19:34:29 -05:00
Andrew Rabert
52dd570142 Merge pull request #671 from Tthecreator/dev 
Set EnableRaisingEvents correctly
 2019-01-22 19:31:33 -05:00
Andrew Rabert
28483bdb54 Merge pull request #651 from jellyfin/release-10.1.0 
Release 10.1.0
 2019-01-22 18:13:47 -05:00
Bond_009
722120af74 Remove conditions that are always true/false 2019-01-22 23:49:51 +01:00
Claus Vium
df5e87409a Fix trim input 2019-01-22 22:40:06 +01:00
Claus Vium
94789860b1 Trim quotes from If-None-Match 2019-01-22 22:37:26 +01:00
Claus Vium
fd6d35e1d0 Remove unconditional caching, modified since header and use ETags 2019-01-22 21:18:48 +01:00
Tthecreator
cce90d2b56 removed excess newlines 2019-01-22 19:42:58 +01:00
Joshua Boniface
8106c8393b Update jellyfin-web submodule to 10.1.0 2019-01-22 13:16:42 -05:00
Tthecreator
0b80902cc8 Set EnableRaisingEvents correctly for SubtitleEncoder 2019-01-22 16:52:26 +01:00