Commit Graph

13026 Commits

Author SHA1 Message Date
Phallacy
2c26517172 minor style fixes 2019-03-04 23:58:25 -08:00
Phallacy
edba82db37 fixed logic flip in auth empty check and fixed crypto algo choice 2019-02-27 23:05:12 -08:00
Phallacy
098de6b050 made newlines into linux newlines 2019-02-20 01:17:30 -08:00
Phallacy
a0d31a49a0 merging with master to clear merge conflict 2019-02-20 00:46:13 -08:00
Phallacy
6bbb968b57 minor changes and return to netstandard 2019-02-20 00:00:26 -08: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
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
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
Phallacy
56e3063342 little fixes for JustAMan 2019-02-18 10:56:01 -08: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
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
Phallacy
48e7274d37 added justaman notes, fixed new bug from emty has removals 2019-02-18 01:26:01 -08:00
LogicalPhallacy
9f3aa2cead
Apply suggestions from code review
Adding minor stylistic suggestions from Bond-009

Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
2019-02-18 00:31:03 -08: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
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
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
Vasily
b7ae044e65
Merge pull request #885 from Bond-009/warn
More warning fixes
2019-02-16 03:22:12 +03: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