Erwin de Haan
|
38f96af079
|
Reformat JustAMan review pt2 changes
Refs #575
|
2019-01-17 20:24:39 +01:00 |
|
Erwin de Haan
|
321c440739
|
Reformat JustAMan review pt1 changes
Refs #575
|
2019-01-17 20:24:01 +01:00 |
|
Erwin de Haan
|
e241589969
|
Merge branch 'dev' into skia-native-arm
|
2019-01-17 17:48:01 +01:00 |
|
Erwin de Haan
|
47f08fbb12
|
Remove Musl build. dotnet is not yet ready (icu-libs still require libstdc++).
|
2019-01-17 17:45:34 +01:00 |
|
Erwin de Haan
|
a0195420df
|
Added Musl dep and switched package names.
|
2019-01-16 23:30:29 +01:00 |
|
Joshua M. Boniface
|
7aa975325a
|
Merge pull request #455 from Bond-009/cleanup
Cleanup some small things
|
2019-01-16 13:17:39 -05:00 |
|
Bond-009
|
d0980f0da5
|
Update HttpListenerHost.cs
|
2019-01-16 19:13:13 +01:00 |
|
Bond-009
|
900dc851e6
|
Merge branch 'dev' into cleanup
|
2019-01-16 19:10:42 +01:00 |
|
Joshua M. Boniface
|
933ef43889
|
Merge pull request #587 from Bond-009/naming
Add nuget info to Emby.Naming
|
2019-01-16 11:52:24 -05:00 |
|
Joshua M. Boniface
|
2b1e3aa45f
|
Merge pull request #567 from Bond-009/term
Shutdown gracefully when recieving a termination signal
|
2019-01-16 11:49:53 -05:00 |
|
Bond_009
|
67465c6e10
|
Fix indentation for xml files
|
2019-01-16 16:30:01 +01:00 |
|
Joshua M. Boniface
|
5b1f36ef27
|
Merge pull request #520 from hawken93/fix_aspect
Fix potential bug where aspect ratio would be incorrectly calculated
|
2019-01-15 22:37:01 -05:00 |
|
Joshua Boniface
|
b30d702782
|
Merge branch 'master' into dev
|
2019-01-15 22:29:22 -05:00 |
|
Andrew Rabert
|
27f0633ed8
|
Merge pull request #592 from joshuaboniface/master-10.0.2
Master 10.0.2
|
2019-01-15 22:27:30 -05:00 |
|
Joshua Boniface
|
09606d0353
|
Update Debian version
|
2019-01-15 20:00:53 -05:00 |
|
Joshua Boniface
|
3051b2a1e4
|
Bump version for 10.0.2
|
2019-01-15 19:19:07 -05:00 |
|
Bond-009
|
0ca76597e5
|
Add exception message to log.
Output will be something line: `Failed to bind to port 1900: Address already in use. DLNA will be unavailable`
|
2019-01-15 19:14:36 -05:00 |
|
Bond_009
|
5348fddc9e
|
Don't print stacktrace when failing to bind to 1900
|
2019-01-15 19:14:36 -05:00 |
|
cvium
|
30fef79120
|
Change ItemId to Guid like all the others
|
2019-01-15 19:14:36 -05:00 |
|
Joshua Boniface
|
58af3d4f5c
|
Update Fanart commented-out API key to our own
|
2019-01-15 19:14:36 -05:00 |
|
Joshua Boniface
|
ce0c928ddb
|
Update Omdb API key to our own
|
2019-01-15 19:14:36 -05:00 |
|
Anthony Lavado
|
478306ca15
|
Update OpenSubtitles User Agent to our own
|
2019-01-15 19:14:36 -05:00 |
|
Joshua Boniface
|
a90a85c306
|
Update TheTVDB API key to our own
|
2019-01-15 19:14:36 -05:00 |
|
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 |
|