Andrew Mahone
d33e0a4e2c
Simplify AttachmentExtractor instantiation.
...
Co-Authored-By: Bond-009 <bond.009@outlook.com>
5 years ago
Andrew Mahone
1600d5b53f
Merge remote-tracking branch 'origin/master' into media-attachments-clean
5 years ago
Bond_009
b0a25c4237
Use Mono.Nat Nuget package
5 years ago
Bond_009
d529f81cd9
Improve IInstallationManager interface
5 years ago
Bond_009
016be02cd6
More warning fixes
5 years ago
Andrew Mahone
a9a85f251e
Instantiate AttachmentExtractor in ApplicationHost.
5 years ago
Vasily
9040ef87dc
Merge pull request #1871 from Bond-009/doc
...
Enable `TreatWarningsAsErrors` for MediaBrowser.Common and Emby.Photos
5 years ago
Vasily
79f9887625
Merge pull request #1854 from Bond-009/json
...
Use System.Text.Json api for databases
5 years ago
Bond_009
9d4ce82ab9
Enable `TreatWarningsAsErrors` for MediaBrowser.Common and Emby.Photos
...
Adds `#pragma warning disable CS1591` to all files in
MediaBrowser.Common containing undocumented members.
5 years ago
Bond_009
e553eba31e
Use System.Text.Json api
5 years ago
Bond-009
3ad34de808
Update ApplicationHost.cs
5 years ago
Joshua Boniface
387192610f
Handle Kestrel startup failures with a nice error
5 years ago
Joshua Boniface
cabb9aed31
Configure Kestrel listener to use configured IPs
5 years ago
sparky8251
14f563d7c2
Removed WAN DDNS
...
It's odd that JF still had code lying around for generating a self signed cert. Currently, it does not do this so this code has been removed.
JF also appears to have functions in place to modify provided certs? Warrants deeper investigation. JF should not be attempting modifications of any certs under any circumstance.
5 years ago
sparky8251
208c8b2b9d
Remove missed unused functions
...
Forgot to remove these in the previous WAN IP detection removal commit
5 years ago
sparky8251
0562b4cf6f
Remove WAN IP Detection
5 years ago
Bond_009
14fbd845c2
Move IsoMounter to plugin
5 years ago
Anthony Lavado
6766e04dd6
Merge pull request #1521 from Bond-009/hdhomerun
...
Clean up livestreaming code
5 years ago
Bond_009
237db8ae92
Clean up livestreaming code
5 years ago
Bond_009
8d3b5c851d
Improvements to UserManager
5 years ago
Bond_009
c699c546e4
Improve LocalizationManager
5 years ago
dkanada
bb04545068
Merge pull request #1614 from Bond-009/docs2
...
Document all public/internal members of Emby.Drawing
5 years ago
dkanada
685e9e4f58
Merge pull request #1584 from Bond-009/checksum
...
Check checksum for plugin downloads
5 years ago
Bond_009
2fdf7f1098
Properly dispose DisplayPreferencesRepository
5 years ago
Bond_009
e5b163b86a
Fix possible nullref
5 years ago
Bond_009
838e5d05d5
Document all public/internal members of Emby.Drawing
...
Forces all new public/internal members to be documented.
Enables TreatWarningsAsErrors for Emby.Drawing
5 years ago
Bond_009
5eaf5465a5
Check checksum for plugin downloads
...
* Compare the MD5 checksum when downloading plugins
* Reduced log spam due to http requests
* Removed 'GetTempFileResponse' function from HttpClientManager
* Fixed caching for HttpClientManager
5 years ago
dkanada
5c366e4697
Merge pull request #1612 from Bond-009/warn4
...
Fix warnings
5 years ago
dkanada
b5f3f28f41
Merge pull request #1578 from Bond-009/httpresponse
...
Replace custom code with Asp.Net Core code
5 years ago
Bond_009
25917db07a
Fix doc releated warnings
5 years ago
Bond-009
6032f31aa6
Use CultureInvariant string conversion for Guids
5 years ago
Bond_009
2a58c643d2
Fix more warnings
5 years ago
Bond_009
9fff4b060e
Replace custom code with Asp.Net Core code
5 years ago
Bond_009
8270d0cc91
Move IPv6 scope id removal logic to it's own function
5 years ago
Bond_009
ddd1a282ea
Remove IpAddressInfo and IpEndPointInfo classes
5 years ago
Bond-009
82f041d050
Merge branch 'master' into release-10.3.z
5 years ago
Bond_009
d405a400aa
Fixes issues with HttpClientManager
5 years ago
Bond_009
edfd2d0cd9
Fix startup
5 years ago
dkanada
1b2621cd30
Merge pull request #1454 from Bond-009/webresource
...
Simplify file serving code
5 years ago
Bond-009
0a5550b13d
Remove more unused stuff
5 years ago
Anthony Lavado
d4a42a1680
Merge pull request #1080 from Bond-009/httpclient
...
Remove usage of deprecated 'WebRequest'
6 years ago
Bond-009
af099a9b53
Update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Jean-Samuel Aubry-Guzzi <DrPandemic@users.noreply.github.com>
6 years ago
Bond-009
6ebac0e500
Update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Jean-Samuel Aubry-Guzzi <DrPandemic@users.noreply.github.com>
6 years ago
Anthony Lavado
b25c08e79a
Merge pull request #1156 from Bond-009/sep
...
Small cleanups here and there
6 years ago
Bond_009
253e72f667
Simplify file serving code
6 years ago
Bond-009
61d7bed181
Merge pull request #1304 from jellyfin/release-10.3.z
...
Backmerge 10.3.1
6 years ago
Bond-009
6973182ade
Fix more possible exceptions
6 years ago
Bond-009
f62af07381
Handle exception when loading unsupported assembly
...
Fixes #1256
6 years ago
Bond-009
a8da122fb3
Merge pull request #1252 from jellyfin/release-10.3.z
...
Backmerge release 10.3.0
6 years ago
Bond-009
8f703f4744
Remove unused event
...
Release builds were failing because of this unused event.
6 years ago
Joshua M. Boniface
c3532b92f7
Merge pull request #1158 from Bond-009/httpclean
...
Reduce complexity http routes
6 years ago
Anthony Lavado
34ab99caf1
Move the ProductName to the public endpoint
...
Moves the ProductName field over from the private system/info point to
the public one, for easier identification
6 years ago
Joshua Boniface
05a4161fd3
Correct the installation and removal of plugins
...
Upgrading plugins was broken for various reasons. There are four
fixes and a minor one:
1. Use a directory name based only on the `Name` of the plugin, not
the source filename, which contains the version. Avoids strange
duplication of the plugin.
2. Use the new directory name for the deletes if it's present, so
that installation and removal happen at that directory level
and we don't leave empty folders laying around. Ensures we
properly remove additional resources in plugins too, not just
the main `.dll` file.
3. Ignore the incoming `target` when installing, and always set
it ourself to the proper directory, which would matter when
reinstalling.
4. Deletes an existing target directory before installing if it
exists. Note that not calling any of the plugin removal code
is intentional; I suspect that would delete configurations
unexpectedly when upgrading which would be annoying. This way,
it just replaces the files and then reloads.
5. (Minor) Added some actual debug messages around the plugin
download section so failures can be more accurately seen.
6 years ago
Joshua Boniface
38fcd31917
Search all subdirectories for Plugins
...
This was added in #801 which broke the previous plugin install
behaviour. Previously plugins could be loaded from subdirectories
but this search was only for the highest level. Change it to search
all subdirectories instead to restore the previous behaviour.
Also modifies the same option from #934 , though I'm not 100% sure
if this is needed here.
6 years ago
Joshua M. Boniface
72dd609109
Merge pull request #1149 from LogicalPhallacy/ImprovedPasswordReset
...
Adds per user password reset
6 years ago
Bond_009
3001f21f8d
Hacky fix for a hacky issue
6 years ago
Joshua M. Boniface
2dbc1153e8
Merge pull request #934 from Bond-009/plugin
...
WIP - Don't require a restart for 75% of plugins
6 years ago
Bond-009
73a9079ee2
Merge branch 'master' into httpclient
6 years ago
Joshua M. Boniface
cc2edc4d66
Merge pull request #1151 from Phlogi/patch-1
...
Use public ports and advertise DNS if available for WAN address
6 years ago
Bond-009
d0fbd260d5
Merge branch 'master' into httpclient
6 years ago
Bond-009
a332092769
Reduce complexity http routes
6 years ago
Phlogi
122cba2aa7
Correct use of local variable wanAddress.
6 years ago
Bond-009
b44a70ff36
Simplify/remove/clean code
...
* Remove useless runtime check (we only support one)
* Remove unused args
* Remove a global constant
And ofc fix some warnings ;)
6 years ago
Phlogi
1b03f078b9
No need to assign empty string.
6 years ago
Phlogi
4c8f8cf64c
Removed trailing spaces, renamed get wan IP function.
6 years ago
Bond-009
6566c91360
Seperate changes from #1023
...
The unrelated changes from #1023 (and more)
6 years ago
Claus Vium
6480cfcc87
Formatting update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
6 years ago
Claus Vium
e36d424b5f
Formatting update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
6 years ago
Claus Vium
f7e7d72688
Formatting update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
6 years ago
Claus Vium
3474568ce2
Update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
6 years ago
Claus Vium
89f2dfd78a
Update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
6 years ago
Claus Vium
2c4c56d6d6
Formatting update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
6 years ago
Phlogi
087d4153ae
Fix check for available WAN address.
6 years ago
Phlogi
fb7f29de18
Format the WAN API Url correctly with https and Port.
6 years ago
Phlogi
d18252542d
Also add the WAN switch to the public system info.
6 years ago
Phlogi
030fcaac15
Proper access to configuration objects
6 years ago
Phlogi
7ebb043249
Removed comment, renamed methods consistently.
6 years ago
Claus Vium
598b1c9966
Update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
6 years ago
Claus Vium
cf36aaef2b
Update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
6 years ago
Claus Vium
f30af9cd5f
Update Emby.Server.Implementations/ApplicationHost.cs
...
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
6 years ago
Phlogi
4ffec8ad26
Fix build, missing changes.
6 years ago
Phlogi
69cc5814d8
Change WAN IP behaviour: Use ServerConfiguration.WanDdns if set in configuration.
6 years ago
Phlogi
414a318a0d
WAN Address should use public ports instead of local ports.
...
https://github.com/jellyfin/jellyfin/issues/601#issuecomment-475941080
6 years ago
Phallacy
09921a00aa
made password resets an interface and per user
6 years ago
redSpoutnik
480a6607e2
Merge branch 'master' into subtitle-display-title
6 years ago
PloughPuff
d125fbc43d
Added contact email to user agent
...
MusicBrainz request a contact email address is supplied in comment section of user agent field.
6 years ago
redSpoutnik
427688a0a0
Change subtitles DisplayTitle behavior
6 years ago
Bond-009
bf43dc00bb
More warning fixes
6 years ago
PloughPuff
b864e9da2a
Finalise removal of --ffprobe switch
...
Removed --ffprobe from src files and server/docker scripts.
6 years ago
Vasily
297f25cfc2
Merge pull request #1059 from Bond-009/os
...
Remove EnvironmentInfo
6 years ago
Joshua M. Boniface
6751560228
Merge pull request #1092 from joshuaboniface/configurable-webdir
...
Add configurable webdir option
6 years ago
Bond-009
3ddbda9aca
Merge branch 'master' into xml
6 years ago
Vasily
1fef8bf266
Merge pull request #1060 from Bond-009/assinfo
...
Remove redundant class AssemblyInfo
6 years ago
Joshua Boniface
3c4043199a
Implement review feedback
6 years ago
Bond-009
0ff038f0a2
Fix nullref
6 years ago
Joshua Boniface
132ce3ece1
Add further resources to complete WebPath
6 years ago
Joshua Boniface
25deca9579
Make use of WebPath
6 years ago
Claus Vium
f2062ba19b
Disable HTTPS in Kestrel if Certificate is null
6 years ago
Bond-009
7f42dcc60f
Remove more unused stuff
6 years ago
Claus Vium
e3b844b5aa
Add urlprefixes during init
6 years ago
Bond-009
decaffed86
Remove EnvironmentInfo
...
This moved the last bit of usefulness of EnvironmentInfo into a static
class.
6 years ago
Claus Vium
0abe57e930
Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc
6 years ago
Bond-009
e91dd14b31
Remove redundent class AssemblyInfo
6 years ago
Vasily
a4b52b7264
Merge pull request #844 from ploughpuff/ffmpeg
...
Reworked FFmpeg path discovery and always display to user
6 years ago
Bond_009
a9302b8b53
Remove useless abstraction around XmlReaderSettings
...
This removes the amount of stuff that needs to be passed around
Also removes some unneeded `ManagedFileSystem` usage
6 years ago
Claus Vium
21c2acc520
Remove public Host property
6 years ago
Vasily
2242c8d793
Merge pull request #915 from cvium/remove_encryptionmanager
...
Remove IEncryptionManager
6 years ago
PloughPuff
2617a49b78
Renamed Init() to SetFFmpegPath()
6 years ago
PloughPuff
ed69e690b8
Review comments
...
Address review comments from JustAMan, Bond-009 and cvium.
6 years ago
PloughPuff
20775116f7
Reworked FFmpeg path discovery and always display to user
...
1) Reworked FFmpeg and FFprobe path discovery (CLI switch, Custom xml, system $PATH, UI update trigger). Removed FFMpeg folder from Emby.Server.Implementations. All path discovery now in MediaEncoder.
2) Always display FFmpeg path to user in Transcode page.
3) Allow user to remove a Custome FFmpeg path and return to using system $PATH (or --ffmpeg if available).
4) Remove unused code associated with 'prebuilt' FFmpeg.
5) Much improved logging during path discovery.
6 years ago
Claus Vium
9a4a01fb0e
Fix DI in FileWriter.TransmitFile
6 years ago
Claus Vium
bc00617df7
Remove unused Brotli compressor
6 years ago
Claus Vium
12df381495
Grab content root from config and fix kestrel port bindings
6 years ago
Claus Vium
040871459b
Remove some unused references
6 years ago
Claus Vium
6263b73d9c
Await host startup
6 years ago
Claus Vium
d450169964
Use EnableHttps instead of CertificateInfo
6 years ago
Claus Vium
e823c11b46
Add certificate to https and minor cleanup
6 years ago
Bond-009
9993dafe54
Don't mix LINQ and roreach loops for readability
6 years ago
Claus Vium
fb1de5a921
Remove more cruft and add the beginnings of a socket middleware
6 years ago
Vasily
3769453541
Merge pull request #978 from fasheng/fix-dlna-multiple-interfaces
...
Fix DLNA for multiple interfaces on linux
6 years ago
Claus Vium
9c02e99e35
Undo some of the span abuse
6 years ago
Claus Vium
e342b7bc71
Extend the IHttpServer interface to avoid the typecasting
6 years ago
Claus Vium
e88f079da6
Remove websocket options and configure kestrel listen ports
6 years ago
Claus Vium
4e8de67aca
Remove SocketSharp from Jellyfin.Server and some other cleanup
6 years ago
Claus Vium
a85488cd20
Fix websockets array index out of bounds and some cleanup
6 years ago
Claus Vium
d6c6f3c10c
Still broken
6 years ago
Claus Vium
38f52a139e
Add response compression middleware
6 years ago
Claus Vium
194da8416b
Use middlewares instead of Routing
6 years ago
Claus Vium
f3e7bc0573
Replace some todos with http extensions and prepare some socket work
6 years ago
Claus Vium
c3fa299acc
Remove hardcoded path and fix url bug in Windows
6 years ago
Claus Vium
852460b991
kestrel init
6 years ago
Bond-009
0804bed66d
Log time in a standardized way
6 years ago
Bond_009
0f9006c81f
Use stopwatch for more accurate measurements and reduce log spam
...
DateTime.Now is suitible for small timespans
Replaced the needlessly complex and verbose logging for the httpserver
6 years ago
Xu Fasheng
cf4e64f430
Add option to toggle if ignore virtual interfaces
...
Some VPN like ZerotierOne owns IP address but no gateway, and there is no
good idea in NetworkManager.GetIPsDefault() to filter such virtual interfaces,
so just provide one option to let user decide it.
6 years ago
Vasily
bca7a26ffd
Merge branch 'master' into update_tvdb
6 years ago
Claus Vium
a23f04623e
Remove IEncryptionManager
6 years ago
Joshua M. Boniface
b43317c5e1
Merge pull request #830 from Bond-009/update
...
Removed remaining self-update code
6 years ago
Bond-009
c6188e26af
Got to start somewhere
6 years ago
Vasily
13f2783a8e
Merge pull request #887 from wtayl0r/replace-primitives-with-iconfiguration
...
Replace primitive injection with IConfiguration
6 years ago
Bond_009
77a5617774
Removed remaining self-update code
6 years ago
Vasily
395072239d
Merge pull request #913 from Bond-009/log
...
Reduce log spam
6 years ago
Vasily
e2f6ecaef6
Merge pull request #829 from Bond-009/fields
...
Removed some unused fields
6 years ago
William Taylor
18ae107ce4
Removed unnecessary configuration options and reduced primitive dependencies
6 years ago
Bond-009
a35ea49c99
Merge remote-tracking branch 'upstream/release-10.2.z' into newmaser
6 years ago
Bond-009
bdfd042d70
Merge branch 'master' into fields
6 years ago
Bond-009
a993420676
Reduce log spam
6 years ago
Claus Vium
cb6d2cbd2d
Remove SizeLimit
6 years ago
Claus Vium
ce51025e7c
Use DI for TvDbClientManager
6 years ago
Bond-009
c74028d08d
Address comments
6 years ago
Bond_009
d409623086
Don't create multiple instances of the same type
6 years ago
Bond_009
9af28607c9
Simplify plugin loading
6 years ago
Bond_009
81a8ebde22
Move to Microsoft.Extensions.DependencyInjection
...
This PR replaces SimpleInjector with
Microsoft.Extensions.DependencyInjection.
6 years ago
Joshua Boniface
2f4a00d322
Add support for ZIP plugin archives
...
Most code from @cvium. Also removes the lazy and ill-conceived GUID-
based checksumming, which just died with ZIP archives.
6 years ago
Bond_009
a6a4cd5667
Removed some unused fields
6 years ago
Erwin de Haan
f1ef0b0b4c
Fix namespacing so it lines up properly with file names and paths ( #715 )
...
* Fix stupid namespacing so it lines up properly with file names and paths.
6 years ago
Claus Vium
0ef2b46106
Remove custom Threading
6 years ago
Joshua M. Boniface
c4f51e16a5
Merge pull request #736 from Bond-009/startasync
...
Start startup tasks async
6 years ago
Joshua M. Boniface
56dcc45dc0
Merge pull request #732 from Bond-009/locale
...
Reworked LocalizationManager to load data async
6 years ago
Bond_009
8b073e2ba5
Remove unused field
6 years ago
Claus Vium
8985fb8d58
Remove support for games as a media type
6 years ago
PloughPuff
211ae30188
Revert back to NoAutoRunWebApp
...
Addressed further review comments. Removed unnecessary .ParsedStartupOptions namespace. Removed DataDir, ConfigDir and LogDir from Interface file as not necessary.
6 years ago
PloughPuff
e18b89ca27
Move Options to Jellyfin.Server and create interface file
...
Changes following review comments.
6 years ago
PloughPuff
fd361421b1
Use CommandLineParser package for handling CLI args
6 years ago
Bond-009
2a1f6361a5
Merge branch 'master' into locale
6 years ago
Vasily
c8cb908004
Merge pull request #716 from Bond-009/warnings
...
Remove more compile time warnings
6 years ago
Erwin de Haan
581a7fe078
Unwrapped `MoveDirectory`, `DirectoryExists`, `FileExists` & removed `MoveFile`
6 years ago
Bond_009
1a3543e5a5
Remove code for pre-installed plugins
6 years ago
Bond_009
85a58fd655
Start startup tasks async
6 years ago
Bond_009
51edd5d067
Reworked LocalizationManager to load data async
6 years ago
Andrew Rabert
05fd76c0fa
Merge pull request #723 from Bond-009/dbperf
...
Minor improvements to db code
6 years ago
Andrew Rabert
7165868509
Merge pull request #709 from Bond-009/null
...
Fix always null expressions
6 years ago
Andrew Rabert
b673054c8d
Merge pull request #711 from Bond-009/sysevent
...
Remove remnants of system events
6 years ago
Bond_009
2ffab720fb
Fix ctor
6 years ago
Erwin de Haan
d1a0497f55
Revert "Merge pull request #452 from Bond-009/activitydb"
...
This reverts commit 48ad18d12b
, reversing
changes made to fe197415ca
.
6 years ago
Bond_009
ded9dee22c
Remove more compile time warnings
6 years ago
Bond_009
fd7f420af2
Remove remnants of system events
6 years ago
Bond_009
8af256f9c2
Fix always null expressions
6 years ago
Bond_009
905a253ff5
Suffix async methods with Async
6 years ago
Bond_009
8d9428ebdc
Ensure DB exists
6 years ago
Bond_009
f6f0a8a481
Use EF Core for Activity database
6 years ago
Andrew Rabert
c7f648f86a
Merge branch 'dev' into imagesize
6 years ago
William Taylor
65cd3ed597
Replaced injections of ILogger with ILoggerFactory
...
This makes resolving dependencies from the container much easier as
you cannot resolve with primitives parameters in a way that is any
more readable.
The aim of this commit is to change as little as possible with the end
result, loggers that were newed up for the parent object were given the same
name. Objects that used the base or app loggers, were given a new logger with
an appropriate name.
Also removed some unused dependencies.
6 years ago
Bond_009
8fc8fc0622
Cleanup ImageProcessor
6 years ago
cvium
b35dcbb9f0
Remove MediaBrowser.Text since it violates licenses and is overall hacky
6 years ago
Andrew Rabert
9eada88545
Use AssmeblyProduct for Name
6 years ago
Andrew Rabert
f229c641a1
Remove redundant GetDefaultUserAgent
6 years ago
Andrew Rabert
235125df57
Fix ApplicationUserAgent documentation
6 years ago
Andrew Rabert
8de4eb7d19
Rename ApplicationSemanticVersion to ApplicationVersion
6 years ago
Andrew Rabert
8a5198e6a3
Remove ApplicationVersion
6 years ago
Erwin de Haan
e066a02403
Removed useless method, Name => Jellyfin Server
6 years ago
Erwin de Haan
924ec0c191
Revert Jellyfin.Versioning, Update all versions and user agents.
6 years ago
Erwin de Haan
bb8df8dfa0
Updates reported version in `System/Info*` set of endpoints.
...
Added ProductName and ServerVersion to API.
Added build version and build step. Addressed issues wtih indentation.
Made the BuildVersion an actual object. This lets up link to the github page of that commit.
Fixed class method type and styled link.
Fixed languages and split out the information in the UI.
Moved update-version script and gave it executable permissions. Windows correctly finds the .bat file. And linux takes the one without extension.
Removed tempfiles from replace sessions from csproj.
Updated version generation scripts. Will also work with pre existing version files. (Source tarballs etc.)
Added simple replace for ssh github links.
Add execute rights to update-version.
Wrapped long line in ApplicationHost.cs
Fixed some small issues.
Fixed some small issues, and flipped some if's around.
Converted parameter names to camelBack casing.
Sealed the attribute class.
Removed MPLv2 license.
Fixed file headers.
Added newline.
Moved links in *.csproj files as well.
Fix issues caused by rebase auto merging.
Removed default constructor and added init values to properties, also hid the Remote value form API.
6 years ago
Erwin de Haan
d116efe1f7
Merge branch 'dev' into reformat
6 years ago
Erwin de Haan
321c440739
Reformat JustAMan review pt1 changes
...
Refs #575
6 years ago
Bond-009
900dc851e6
Merge branch 'dev' into cleanup
6 years ago
Erwin de Haan
a358631040
Extra formatting on the merged code.
6 years ago
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
6 years ago
Claus Vium
eca3c099d9
removed a bunch of validation, security, registration, premiere, whatever bs
6 years ago
Erwin de Haan
23f5c1d90b
ReSharper format: 'out' parameter inlining
6 years ago
Erwin de Haan
65bd052f3e
ReSharper conform to 'var' settings
6 years ago