lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,194 Commits 2 Branches 0 Tags 64 MiB
276428878e
Commit Graph

13194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vasily
f274d024ce
Merge pull request #924 from cvium/fix_movie_matching 
Use the movie name instead of folder name
 2019-02-18 15:10:36 +03:00
Vasily
395072239d
Merge pull request #913 from Bond-009/log 
Reduce log spam
 2019-02-18 14:50:53 +03:00
Vasily
e2f6ecaef6
Merge pull request #829 from Bond-009/fields 
Removed some unused fields
 2019-02-18 14:47:02 +03:00
Joshua M. Boniface
9a38e4dc8a
Merge pull request #925 from Bond-009/newmaser 
Merge 10.2.0 release branch back into master
 2019-02-17 13:05:12 -05:00
William Taylor
c607c95e64 Removed async from non-async method 2019-02-17 14:33:20 +00:00
William Taylor
18ae107ce4 Removed unnecessary configuration options and reduced primitive dependencies 2019-02-17 14:09:52 +00:00
William Taylor
3f80b16ffa Removed Reference and replaced with package reference 2019-02-17 14:09:52 +00:00
William Taylor
72aa364aa5 Removed extra using 2019-02-17 14:08:52 +00:00
William Taylor
0d5fbcb031 Removed primitives from services in Program.cs 
This will make it easier to move dependency registration
to a system without having to new up all the services first.
Moved the primitives to an IConfiguration which is much easier to inject.
 2019-02-17 14:08:52 +00:00
Bond-009
a35ea49c99 Merge remote-tracking branch 'upstream/release-10.2.z' into newmaser 2019-02-17 10:38:44 +01:00
Claus Vium
c45b6aa53e Use the movie name instead of folder name 2019-02-17 07:39:36 +01:00
Andrew Rabert
4b4399fba6
Merge pull request #920 from nvllsvm/dockolate_icetainer 
Fix cachedir missing from Docker container
 2019-02-16 15:54:16 -05:00
Andrew Rabert
c06598635f Fix cachedir missing from Docker container 
Adds the /cache volume and set it to writeable by all. This allows for
those using jellyfin to continue using it without modifying their
config. However, retaining cache will require one to mount the /cache
volume.

Also make the /config and /media dirs 777 by default. No permissions on
mounted volumes will be changed.
 2019-02-16 15:25:44 -05:00
Joshua Boniface
a15098dc00 Bump release version for last-minute PRs 2019-02-16 12:13:38 -05:00
Bond-009
4811e76860
Merge branch 'master' into perf 2019-02-16 17:05:44 +01:00
Bond-009
64a4f259a2
Merge branch 'master' into async 2019-02-16 17:05:05 +01:00
Bond-009
bdfd042d70
Merge branch 'master' into fields 2019-02-16 17:03:15 +01:00
Bond-009
a993420676 Reduce log spam 2019-02-16 16:42:24 +01:00
Bond-009
fb6a901374 Separate HttpPostedFile 2019-02-16 11:46:58 +01:00
Bond-009
86a4d15a32
Merge pull request #899 from AThomsen/bugfix/dlna_name_race_condition 
DLNA: Fix race condition leading to missing device names
 2019-02-16 11:07:30 +01:00
Bond-009
25c2267a89
Merge pull request #907 from cvium/fix_assembly_visibility 
Fix assembly visibility
 2019-02-16 10:38:10 +01:00
Andrew Rabert
b86f049e66
Merge pull request #910 from nvllsvm/make_it_so 
Enhance Dockerfiles
 2019-02-16 01:53:10 -05:00
Andrew Rabert
12fea24590
Merge pull request #911 from nvllsvm/hooked_on_phonics 
Checkout submodules in Docker Hub hook
 2019-02-16 01:53:01 -05:00
Andrew Rabert
26e2ffdd31 Checkout submodules in Docker Hub hook 2019-02-16 01:45:48 -05:00
Andrew Rabert
d9ab654abe Enhance Dockerfiles 
* Prevent failure when obj exists from host compile
* Enhance readability of disposed stages
* Formatting
 2019-02-16 01:37:55 -05:00
Andrew Rabert
c44f96b727
Merge pull request #909 from n8225/dockerBuilds 
Fix docker arm builds
 2019-02-16 01:34:37 -05:00
n8225
c5ac36c886 Fix docker arm builds 2019-02-15 23:34:16 -06:00
Joshua Boniface
ff9a0c7e55 Update submodule to 10.2.0 release 2019-02-15 21:04:20 -05:00
Joshua Boniface
056e19f350 Remove superfluous changelog entries 2019-02-15 21:04:12 -05:00
Joshua Boniface
f8ba55e202 Update version to 10.2.0 release 2019-02-15 20:52:54 -05:00
Joshua M. Boniface
4ea76f9cdc
Merge pull request #883 from jellyfin/translations 
Import Translations
 2019-02-15 20:47:37 -05:00
Joshua M. Boniface
88f56cd0c4
Merge pull request #892 from joshuaboniface/depend-ffmpeg-version 
Add jellyfin-ffmpeg and versioning to package deps
 2019-02-15 20:40:29 -05:00
PloughPuff
69ea15f73a Use string interpolation 
Two further review comments from JustAMan.
 2019-02-16 00:47:38 +00:00
Vasily
b7ae044e65
Merge pull request #885 from Bond-009/warn 
More warning fixes
 2019-02-16 03:22:12 +03:00
PloughPuff
d8d237f6f2 Review comments 
Addressed review comments from JustAMan.  Removed code to determine experimental version.  Store major and minor as two ints.  Allow control of a min and max recommended version.
 2019-02-15 23:51:22 +00:00
Bond-009
18e1d03a89 Comments 2019-02-16 00:44:10 +01:00
Vasily
3947f2315d Update Jellyfin.Server/Jellyfin.Server.csproj 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-02-16 00:43:56 +01:00
Bond-009
cb9e50b2ea Reorder elements 2019-02-16 00:43:56 +01:00
Bond-009
e620bb9512 Remove more doc warnings 2019-02-16 00:43:56 +01:00
Bond-009
8b04fe7633 More fixes 2019-02-16 00:43:56 +01:00
Bond-009
2cb747651b Correctly dispose WebSocketSharpListener 2019-02-16 00:43:56 +01:00
Bond-009
46897aab4f More warnings 2019-02-16 00:43:56 +01:00
Bond-009
892787cb1a Disable SA1130 2019-02-16 00:43:56 +01:00
Bond-009
be77e14db9 Warnings for docs 2019-02-16 00:43:56 +01:00
Bond-009
34af7501fa Fix up CoreAppHost.cs 2019-02-16 00:43:56 +01:00
Bond-009
183ef34422 Do not declare visible instance fields 2019-02-16 00:43:56 +01:00
Bond-009
637936cb9f Closing braces should be followed by an empty line 2019-02-16 00:43:56 +01:00
Bond-009
fc59b0ab77 Disable SA1512 2019-02-16 00:43:56 +01:00
Bond-009
d8b312674d No multiple empty lines 2019-02-16 00:43:56 +01:00
Bond-009
ebae7229c1 Single line comments should start with a space 2019-02-16 00:43:56 +01:00