Erwin de Haan
|
1e94023927
|
Merge branch 'dev' into reformat
|
2019-01-19 14:45:02 +01:00 |
|
Vasily
|
a00c0defa8
|
Merge pull request #596 from Bond-009/editorconfig
Fix indentation for xml files
|
2019-01-19 16:35:38 +03:00 |
|
Erwin de Haan
|
e63b18f17d
|
Reformat JustAMan review second pass changes.
|
2019-01-19 14:30:23 +01:00 |
|
Andrew Rabert
|
72ab479d1f
|
Merge pull request #619 from sparky8251/really-slimdown-docker-image
Really slim down Docker container
|
2019-01-18 21:49:23 -05:00 |
|
Joshua M. Boniface
|
bf7d8fdf4a
|
Merge pull request #589 from ploughpuff/patch-1
Ensure config and log folders exist
|
2019-01-18 14:32:09 -05:00 |
|
PloughPuff
|
582226c133
|
Cause exception if empty string used for config or log folders
|
2019-01-18 18:11:42 +00:00 |
|
PloughPuff
|
529d804414
|
Modify to use correct logic before creating directory
Address review comments.
|
2019-01-18 17:22:14 +00:00 |
|
Erwin de Haan
|
d116efe1f7
|
Merge branch 'dev' into reformat
|
2019-01-18 17:04:01 +01:00 |
|
Erwin de Haan
|
c1f76eb8ab
|
Reformat JustAMan review pt3 changes
|
2019-01-18 16:48:01 +01:00 |
|
Sparky
|
d00e43735f
|
Really slim down Docker container
#606 didn't actually run the new commands due to the comments position.
This fixes the comment location.
|
2019-01-18 10:26:02 -05:00 |
|
PloughPuff
|
04d03c5cf9
|
Ensure all folders are created before running app
|
2019-01-18 10:10:45 +00:00 |
|
Andrew Rabert
|
e9e152d2fc
|
Adapt SwaggerService for Jellyfin
|
2019-01-18 00:55:33 -05:00 |
|
Andrew Rabert
|
cfd5d1a4f2
|
Restore SwaggerService from 7aa573d4e0fc231932ad3da4cdf15199cf97709a
|
2019-01-18 00:40:33 -05:00 |
|
Andrew Rabert
|
440350a3f6
|
Merge pull request #606 from sparky8251/docker-update
Slim down docker image
|
2019-01-17 20:54:08 -05:00 |
|
Sparky
|
fe4c3fddb4
|
Slim down docker image
After installing, remove package caches and clean up after installation of stuff.
|
2019-01-17 18:59:52 -05:00 |
|
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 |
|