Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-22 21:50:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
12688 commits 24 branches 76 tags 1.3 GiB
Commit graph

12688 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joshua Boniface 44ec5d2631 Update FanArt API key to our own 2019-01-15 19:14:36 -05:00
Joshua Boniface 18fae029d6 Update TheAudioDB API key to our own 2019-01-15 19:14:36 -05:00
Joshua Boniface 036dfc4168 Update TheMovieDB API key to our own 2019-01-15 19:14:36 -05:00
hawken bddfca6215 Fix potential problem where aspect ratio would be incorrectly calculated 2019-01-15 20:10:26 +00:00
Erwin de Haan a358631040 Extra formatting on the merged code. 2019-01-15 17:35:33 +01:00
Erwin de Haan 49b61f238e Merge branch 'dev' into reformat 
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1
 2019-01-15 17:34:39 +01:00
Claus Vium 99acf83dfa Add cvium to CONTRIBUTORS 2019-01-15 16:48:21 +01:00
cvium e5ffa45dbe more descriptive TODO 2019-01-15 16:48:21 +01:00
cvium 22a64f37f5 More cleaning 2019-01-15 16:48:21 +01:00
cvium 0e422a33d6 Some code style clean up 2019-01-15 16:48:21 +01:00
Claus Vium 256e6dc195 removed more dead code 2019-01-15 16:48:21 +01:00
Claus Vium e0e5a487c3 removed commented code 2019-01-15 16:48:21 +01:00
Claus Vium 801726ce38 readded some registration endpoints 2019-01-15 16:48:21 +01:00
hawken 19319e8eb6 Remove MBLicenseFile 2019-01-15 16:48:21 +01:00
Claus Vium d707e969fa Added some todos 2019-01-15 16:48:21 +01:00
Claus Vium 4a03ac4022 mock the registration endpoint since livetv etc. still uses it 2019-01-15 16:48:21 +01:00
Claus Vium eca3c099d9 removed a bunch of validation, security, registration, premiere, whatever bs 2019-01-15 16:48:21 +01:00
Andrew Rabert 8ea0c72070 Merge pull request #335 from EraYaN/build-system-consolidation 
Build scripts and build system consolidation.
 2019-01-14 20:06:28 -05:00
Bond-009 351bac44c5 Add nuget info to Emby.Naming 2019-01-14 22:02:51 +01:00
Erwin de Haan 9c4239af01 Updated MediaBrowser.Tests AssemblyInfo.cs 2019-01-14 08:32:31 +01:00
Erwin de Haan 9b224d7080 Merged the two ARM platforms. To be split apart when a binary ffmpeg is required. 2019-01-13 23:43:12 +01:00
Erwin de Haan ca320ba7ac Sudo fix for debian and fedora. 2019-01-13 23:34:40 +01:00
Erwin de Haan ae0732136f Merge remote-tracking branch 'upstream/dev' into build-system-consolidation 2019-01-13 23:28:05 +01:00
Erwin de Haan d7b7be395b Moved ARM dockerfiles back to root. 2019-01-13 23:24:43 +01:00
Erwin de Haan 9d0a08571e Merge branch 'dev' into reformat 2019-01-13 21:59:37 +01:00
Joshua M. Boniface f8dd182e42 Merge pull request #562 from hawken93/misc_fix 
Fix error with uppercase photo extension and fix typo in a log line
 2019-01-13 15:49:05 -05:00
Erwin de Haan 23f5c1d90b ReSharper format: 'out' parameter inlining 2019-01-13 21:48:18 +01:00
Erwin de Haan e867446437 ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Andrew Rabert f50a997e40 Merge pull request #580 from nvllsvm/fixbuild 
Fix Docker build
 2019-01-13 20:39:42 +00:00
Andrew Rabert 006e81588a Merge pull request #576 from Bond-009/analysers 
Add code analysers for debug builds
 2019-01-13 20:38:08 +00:00
Erwin de Haan 65bd052f3e ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Andrew Rabert 17c60f46db Fix build 2019-01-13 15:35:15 -05:00
Erwin de Haan a36658f6f0 ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
Andrew Rabert f11a4368bb Reformat args 2019-01-13 15:30:30 -05:00
Erwin de Haan 9fa60ec934 Find+Sed BOM removal all toher files, except test files. 2019-01-13 21:20:44 +01:00
Erwin de Haan 089ad8e7c2 Find+Sed BOM removal *.xml,*.csproj,*,json,*.sln,*.txt 2019-01-13 21:10:15 +01:00
Erwin de Haan b062577d81 Find+Sed BOM removal *.cs: MediaBrowser.Providers-SocketHttpListener 2019-01-13 21:03:10 +01:00
Erwin de Haan 8f41ba4d3a Find+Sed BOM removal *.cs: MediaBrowser.LocalMetadata-MediaBrowser.Model 2019-01-13 21:02:23 +01:00
Erwin de Haan ba610b5094 Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
Erwin de Haan e566d9a231 Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
Erwin de Haan 742bef5b5f EditorConfig reformat: Non-CS files. 2019-01-13 20:45:51 +01:00
Erwin de Haan aacafee1de EditorConfig reformat: MediaBrowser.Providers, MediaBrowser.Tests, SocketHttpListener 2019-01-13 20:31:48 +01:00
Erwin de Haan 382e8699a2 EditorConfig reformat: MediaBrowser.Model 2019-01-13 20:31:15 +01:00
Erwin de Haan 3ed6f37030 EditorConfig reformat: MediaBrowser.Controller 2019-01-13 20:30:58 +01:00
Erwin de Haan 51ed47f4c4 EditorConfig reformat: Emby.XmlTv, Jellyfin.Server. MediaBrowser.Api, MediaBrowser.Common 2019-01-13 20:30:41 +01:00
Erwin de Haan 5b3d8a6d76 EditorConfig reformat: Emby.IsoMounting, Emby.Server.Implementations 2019-01-13 20:30:03 +01:00
Erwin de Haan cc719fd77c EditorConfig reformat: BDInfo, DvdLib, Emby.Dlna 2019-01-13 20:29:23 +01:00
Erwin de Haan 8fd0bc63b9 Visual Studio Reformat: SocketHttpListener 2019-01-13 20:27:29 +01:00
Erwin de Haan 9014e16037 Visual Studio Reformat: OpenSubtitlesHandler 2019-01-13 20:27:11 +01:00
Erwin de Haan 9741817af4 Visual Studio Reformat: MediaBrowser.XbmcMetadata 2019-01-13 20:26:56 +01:00