Commit graph

13037 commits

Author SHA1 Message Date
Torsten 268b099ca8 Merge branch 'populate-extras' of github.com:Liggy/jellyfin into populate-extras 2019-02-20 16:38:30 +01:00
Liggy 33171a58b5 Merge branch 'master' into populate-extras 2019-02-20 16:37:57 +01:00
Liggy 13bfe5093e
Merge branch 'master' into populate-extras 2019-02-20 14:24:23 +01:00
Bond-009 99bed9a9c3
Merge pull request #939 from joshuaboniface/cleanup-builds
Clean up and rename obsolete deployment platforms
2019-02-20 07:28:20 -05:00
Vasily 8ef41020d9
Merge pull request #847 from Bond-009/async
Make websockets code async
2019-02-20 15:03:42 +03:00
Bond-009 fca226bdfd
Add comment 2019-02-20 12:53:35 +01:00
Vasily 60df855b26
Merge pull request #930 from fruhnow/AuthorizationCheck
checking user-permission in GetQueryResult
2019-02-20 14:42:35 +03:00
Vasily 44ed037e73
Merge pull request #950 from cvium/replace_priority_queue
Replace OptimizedPriorityQueue source with NuGet reference
2019-02-20 14:39:52 +03:00
Vasily 50ce7572b4
Merge pull request #851 from Bond-009/appdata
Simplify code to get data dir
2019-02-20 14:31:01 +03:00
Vasily 74695428fe
Merge pull request #914 from Bond-009/httppostedfile
Separate HttpPostedFile into it's own file
2019-02-20 13:33:42 +03:00
Joshua M. Boniface 6c6e9ca9f2
Merge pull request #889 from Bond-009/xmlex
Fix uncaught xml error
2019-02-19 21:31:16 -05:00
Joshua M. Boniface 89d4ce309d
Merge pull request #848 from Bond-009/perf
Minor changes to reduce allocations
2019-02-19 21:24:51 -05:00
Joshua M. Boniface b43317c5e1
Merge pull request #830 from Bond-009/update
Removed remaining self-update code
2019-02-19 21:21:36 -05:00
Torsten 5917e91447 Merge https://github.com/jellyfin/jellyfin into populate-extras 2019-02-19 23:21:40 +01:00
Torsten 9753a76905 Populate video extras again 2019-02-19 22:41:25 +01:00
Vasily 24b76dbed8
Merge pull request #936 from EraYaN/fix-drone-abi-tests
Fixed the assemblynames for compatibility check in drone.
2019-02-20 00:22:09 +03:00
Claus Vium dab25a0eeb Remove OptimizedPriorityQueue source and grab it from nuget 2019-02-19 21:17:30 +01:00
Felix Ruhnow 53beebc774 switching logging to serilog convention according to pr comments 2019-02-19 12:17:28 +01:00
Felix Ruhnow ba003e06ef adressing pr comments 2019-02-19 12:09:39 +01:00
Felix Ruhnow 1d631540ac adressing pr comments 2019-02-19 12:06:50 +01:00
Joshua Boniface 3ed9d32f68 Rename Windows scripts folder 2019-02-18 22:07:53 -05:00
Joshua Boniface 3ecfd1fdd1 Rename framework to portable 2019-02-18 22:07:12 -05:00
Joshua Boniface 24574d4964 Rename MacOS build 2019-02-18 22:06:44 -05:00
Joshua Boniface 512ab8c6aa Remove unneeded Linux builds 2019-02-18 22:06:06 -05:00
Erwin de Haan 2ad54cd09d Fixed the assemblynames from drone since, the namespaces do not line up (yet). 2019-02-19 01:18:49 +01:00
Joshua M. Boniface 781cca0c82
Merge pull request #902 from brianjmurrell/copr-autobuild
COPR auto building
2019-02-18 13:53:59 -05:00
Andrew Rabert eab35890dc
Merge pull request #862 from EraYaN/abi-check-drone
Add dotnet-compat ABI testing and Debug configuration building to drone-CI
2019-02-18 13:11:06 -05:00
Felix Ruhnow 967d5deeb7 checking user-permission in GetQueryResult to prevent accessing the library without permission but having a link. (+added myself as contributor. forgot last time bout that) 2019-02-18 18:29:58 +01:00
Bond-009 51ba28bd65 Remove useless check 2019-02-18 17:37:10 +01:00
Bond_009 a94aeb5c87 Simplify code to get data dir 2019-02-18 17:35:09 +01:00
Vasily 13f2783a8e
Merge pull request #887 from wtayl0r/replace-primitives-with-iconfiguration
Replace primitive injection with IConfiguration
2019-02-18 19:30:11 +03:00
Bond_009 7554f63551 Remove more self-update code 2019-02-18 16:57:08 +01:00
Bond_009 25253cf961 Fix style issues in changed files 2019-02-18 16:57:08 +01:00
Bond_009 77a5617774 Removed remaining self-update code 2019-02-18 16:57:08 +01: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
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