michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
15,536 Commits 2 Branches 79 Tags 73 MiB
e6ef680775
Commit Graph

2666 Commits

Author SHA1 Message Date
Joshua Boniface
d4474d493b Remove extraneous newline 2019-11-03 12:39:45 -05:00
Erwin de Haan
387051c409 Fix the last docs warnings. 2019-11-03 15:52:10 +01:00
Bond_009
d529f81cd9 Improve IInstallationManager interface 2019-11-01 17:57:19 +01:00
Bond_009
a245f5a0d4 Rewrite hex encoder/decoder 2019-11-01 17:52:29 +01:00
dkanada
89a21c96c0
Merge pull request #1852 from Bond-009/warn9 
Fix some more warnings
 2019-11-02 01:24:44 +09:00
Bond_009
d9a03c9bb1 Fix more warnings 2019-10-29 17:55:16 +01:00
Vasily
8cf8c36708 Move throwing if cancelled after logging that fact 2019-10-27 16:48:42 +03:00
Vasily
dd7ae7747e
Apply suggestions from code review 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-10-27 16:47:00 +03:00
grafixeyehero
752cf08e5c update persons service 2019-10-23 01:54:32 +03:00
Andrew Mahone
20727906c8 Use attachment filename if available. 2019-10-22 11:54:59 -04:00
Andrew Mahone
01b1c847e9 Provide delivery URLs for attachments in PlaybackInfo. 2019-10-22 11:54:59 -04:00
Andrew Mahone
8c89d89932 Attachment service. 2019-10-22 11:54:59 -04:00
Vasily
3743137c31 Address Bond-009 review comments 2019-10-21 12:05:49 +03:00
Vasily
ae2b95024f
Update MediaBrowser.Api/Playback/BaseStreamingService.cs 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-10-21 11:58:04 +03:00
Bond_009
fef35d0505 Add clearer exceptions, warnings and docs 2019-10-20 21:12:03 +02:00
Bond_009
bbc0875387 Don't shuffle some types by default 2019-10-20 16:08:40 +02:00
Vasily
6b6fede2e0 Address review comments 2019-10-16 16:13:59 +03:00
Vasily
adccc18298 Revert "yarn build" as it is fixed in master, fix typo 2019-10-14 14:07:12 +03:00
Vasily
3132280b07 * Make sure force_key_frames expression arguments are properly converted to strings 
* Fore usage of keyframe cuts only in HLS
 2019-10-14 13:22:53 +03:00
Vasily
2f6879e869 Add limiting max keyframe interval when full transcoding 2019-10-14 13:22:53 +03:00
Vasily
986ea5c636 Fix log message - log args were swapped 2019-10-14 13:22:53 +03:00
Vasily
3740228100 Don't start waiting for a segment which doesn't exist if transcoding is not running 2019-10-14 13:22:52 +03:00
Vasily
7aea9266d0 Stop waiting for a segment to become ready if there's no alive transcode 
Remove extra quotes in logging

Fix typo in comment
 2019-10-14 13:22:39 +03:00
Vasily
c1f9107b8b Add more logging 
Trying to fix hls muxer plus ffmpeg 4.1+ combo

Try to fix waiting for segment being ready

This is needed because hls muxer in ffmpeg >= 4.1 creates the
playlist only when it finishes transcoding.

Also cleaned up logs a bit.

Lower log level for "StartFfmpeg finished" to debug
 2019-10-14 13:22:15 +03:00
Vasily
6746f708f2 Revert "Revert "Fix premature stop when streaming"" 
This reverts commit 575b96d03a.
 2019-10-14 13:16:30 +03:00
Bill Thornton
80dccdef22 Add using block and HexHelper 2019-10-02 09:51:53 -04:00
Bill Thornton
119041a425 Fix SchedulesDirect authentication 2019-10-02 01:35:28 -04:00
Joshua M. Boniface
575b96d03a
Revert "Fix premature stop when streaming" 2019-10-01 12:07:09 -04:00
Andrew Rabert
fd1bdad0e2 Ignore exception when attempting to kill ffmpeg that has exited 
A race condition where this code attempts to kill an already exited
ffmpeg process is possible. This results in unnecessary error logging.

This change replaces the generic exception handling with the above
mentioned exception. No log output is produced.
 2019-09-29 19:19:53 -04:00
Vasily
4fae733eef Cleaned up move to HLS muxer 2019-09-27 18:22:43 +03:00
Vasily
36a34f911e Replaced "stream" muxer with "hls" trying to fix "premature stop" issue 2019-09-27 16:37:41 +03:00
Bond_009
c9820d30ed Fix multiple mistakes and warnings 2019-09-23 20:32:44 +02:00
Bond-009
6f17a0b7af Remove legacy auth code (#1677) 
* Remove legacy auth code

* Adds tests so we don't break PasswordHash (again)
* Clean up interfaces
* Remove duplicate code

* Use auto properties

* static using

* Don't use 'this'

* Fix build
 2019-09-17 12:07:15 -04:00
Erwin de Haan
e8b13ea8a9 Fix culture problem on Windows for segment_time_delta argument. 2019-09-10 16:31:35 +02:00
Bond_009
675754bc5c Possible fix for MrMC 2019-09-08 21:07:29 +02:00
Bond-009
ee637e8fec Fix warnings, improve performance (#1665) 
* Fix warnings, improve performance

`QueryResult.Items` is now a `IReadOnlyList` so we don't need to
allocate a new `Array` when we have a `List` (and `Items` shouldn't need to
be mutable anyway)

* Update Providers .csproj to latest C#

* Remove extra newline from DtoService.cs

* Remove extra newline from UserLibraryService.cs
 2019-09-02 02:19:29 -04:00
Anthony Lavado
cb393c215a
Merge pull request #1686 from Bond-009/warn7 
More warning fixes
 2019-09-02 02:07:19 -04:00
Bond_009
e4f893a0eb More warning fixes 2019-08-29 22:28:33 +02:00
marius
b711ece829 - fix ArgumentOutOfRangeException at MediaBrowser.Api.Playback.BaseStreamingService.ParseTimeSeekHeader (second substring argument is length) 2019-08-28 21:05:17 +03:00
Bond_009
efc4805233 Fix login 2019-08-28 14:45:46 +02:00
Andrew Rabert
24775f4988
Merge pull request #1651 from sl1288/master 
Fix local trailers playback
 2019-08-27 19:02:05 -04:00
Bond-009
e87d7cfaf3
Merge pull request #1659 from jellyfin/fix_ffmpeg 
Fix segment_time_delta value for ffmpeg 4.1
 2019-08-25 13:38:11 +02:00
Claus Vium
2e66361482 Move argument to new line 2019-08-24 11:38:33 +02:00
Claus Vium
15b054be94 Fix style issues 2019-08-24 11:17:17 +02:00
Joshua M. Boniface
1dfd5000ff
Merge pull request #1499 from crobibero/log-password-ip 
Log IP address on failed login attempt
 2019-08-23 23:40:45 -04:00
crobibero
4f974122f8 log password on failed login attempt 2019-08-23 23:28:52 -04:00
Joshua M. Boniface
d95c04787c
Merge branch 'master' into h265 2019-08-19 14:57:48 -04:00
SL1288
fdc24ec2ee Fix LocalTrailers playback. 2019-08-19 18:56:41 +02:00
Bond_009
8d3b5c851d Improvements to UserManager 2019-08-16 21:06:11 +02:00
Claus Vium
617f7e8b5b Fix segment_time_delta value for ffmpeg 4.1 2019-08-16 19:52:54 +02:00
Bond_009
c699c546e4 Improve LocalizationManager 2019-08-16 17:31:47 +02:00
dkanada
bb04545068
Merge pull request #1614 from Bond-009/docs2 
Document all public/internal members of Emby.Drawing
 2019-08-15 21:01:44 -07:00
dkanada
685e9e4f58
Merge pull request #1584 from Bond-009/checksum 
Check checksum for plugin downloads
 2019-08-15 01:00:33 -07:00
Anthony Lavado
29623d36e8
Merge pull request #1568 from whooo/master 
Add DLNA headers if requested by the client
 2019-08-13 01:29:16 -04:00
Bond_009
838e5d05d5 Document all public/internal members of Emby.Drawing 
Forces all new public/internal members to be documented.
Enables TreatWarningsAsErrors for Emby.Drawing
 2019-08-11 16:52:37 +02:00
Bond_009
7243689215 Minor improvements 2019-08-11 15:57:36 +02:00
Bond_009
5eaf5465a5 Check checksum for plugin downloads 
* Compare the MD5 checksum when downloading plugins
* Reduced log spam due to http requests
* Removed 'GetTempFileResponse' function from HttpClientManager
* Fixed caching for HttpClientManager
 2019-08-11 15:54:58 +02:00
dkanada
1ad67e223f
Merge pull request #1462 from Bond-009/installationmanager 
Improvements to InstallationManager
 2019-08-11 03:47:10 -07:00
whooo
9556561a77
Merge branch 'master' into master 2019-08-11 12:42:19 +02:00
Joshua M. Boniface
a96fa7a5c7
Merge pull request #1397 from Bond-009/passfast 
Streamline authentication proccess
 2019-08-10 21:42:46 -04:00
dkanada
b5f3f28f41
Merge pull request #1578 from Bond-009/httpresponse 
Replace custom code with Asp.Net Core code
 2019-08-09 23:26:10 -07:00
Bond_009
9b2cf8501f Add last one 2019-08-09 23:24:04 +02:00
Bond_009
52c1b45feb Fix build 2019-08-09 23:17:54 +02:00
Bond-009
6032f31aa6 Use CultureInvariant string conversion for Guids 2019-08-09 23:17:54 +02:00
Bond_009
cf7290343f Fix build 2019-08-09 22:36:20 +02:00
Bond_009
9fff4b060e Replace custom code with Asp.Net Core code 2019-08-09 22:36:20 +02:00
Erik Larsson
a1efe4caca Add DLNA headers if requested by the client. 
And remove the code which adds the headers as ResponseHelper.WriteToResponse
will do it.
 2019-07-27 19:55:18 +02:00
Bond-009
82f041d050
Merge branch 'master' into release-10.3.z 2019-07-06 23:08:52 +02:00
Bond_009
0f897589ed Streamline authentication proccess 2019-07-06 14:52:24 +02:00
dkanada
e722801f80
Merge pull request #956 from Bond-009/db 
Simplify db code
 2019-07-02 11:56:13 -07:00
dkanada
9079b3e8da add optional password field on user creation 2019-06-30 01:58:01 -07:00
Bond-009
27c29bbb4c Back to a single connection 2019-06-28 12:13:34 +02:00
Jörn
1fd8164756 fix issue #1347 introduced in pr #930 2019-06-26 01:13:54 -07:00
Bond_009
65a0ca2f32 Improvements to InstallationManager 2019-06-14 18:38:14 +02:00
Joshua M. Boniface
687255aa31
Merge pull request #1442 from jellyfin/release-10.3.z 
Backmerge for Release 10.3.4 and 10.3.5
 2019-06-12 23:30:57 -04:00
pjeanjean
7919dd81da Skip user permission checking for UserRootFolder 
Fix #1436
UserRootFolders are used to represent virtual folders that exist outside
of libraries. As such, it doesn't make sense to check if a user has the
right to access their library (named `Media Folders`).
 2019-06-06 08:30:56 +02:00
Claus Vium
c05b7c382a Change UsCulture to InvariantCulture 2019-06-05 20:59:06 +02:00
Anthony Lavado
d7aaa1489c
Merge pull request #1427 from dkanada/fanart 
Move fanart image provider to plugin
 2019-06-05 01:19:54 -04:00
Anthony Lavado
256f44a870
Merge pull request #994 from Bond-009/tasks 
Remove Tasks wrapped in a Task
 2019-06-05 01:11:25 -04:00
Anthony Lavado
f631b2ecdc
Merge pull request #1159 from Bond-009/streamjob 
Trying to make sense of the streaming code
 2019-06-04 00:20:43 -04:00
Frank
3ba709fcc3 Fix #1432. Add support for encoding with libx265 and hevc_nvenc. 2019-06-01 15:46:41 -07:00
Bond-009
ce1fa42f9d
Merge branch 'master' into tasks 2019-06-01 17:06:01 +02:00
dkanada
09dfa071dc move fanart image provider to plugin 2019-05-31 01:48:20 -07:00
Jean-Samuel Aubry-Guzzi
12721eb7dd Fix non-ascii filename downloads 
Follow https://tools.ietf.org/html/rfc5987#section-3.2.2 to encode
non-ascii filenames in HTTP Content-Disposition header.
 2019-05-07 19:43:04 -04:00
bugfixin
a827a2fbcc Remove unreachable code and const trySupportSeek within BaseProgressiveStreamingService 2019-04-25 19:14:33 +00:00
Claus Vium
28c2ac528d Re-add content length, semi revert of changes in #1010 (#1287) 
* Re-add content length, semi revert of changes in #1010
 2019-04-24 14:06:54 +02:00
Joshua Boniface
31ad366aa9 Implemented suggested conditional 2019-04-18 10:24:08 -04:00
Joshua Boniface
10f33b0273 Update conditional to be correct 2019-04-18 09:31:30 -04:00
Joshua Boniface
eaa1ac8013 Apparently strings can't be !'d 2019-04-17 22:49:17 -04:00
Joshua Boniface
e790f024c2 Return MethodNotAllowedException if Pw is not set 
Don't accept pre-hashed (not-plaintext) passwords as the auth
provider no longer supports this due to sha1+salting the passwords
in the database.
 2019-04-17 22:33:00 -04:00
Bond-009
e89c8dbf76 Use CultureInfo.InvariantCulture 2019-04-17 15:23:03 +02:00
Bond_009
9aaeb19418 Self-documenting code 2019-03-27 17:05:08 +01:00
Bond_009
b647959ec4 Add EnableOutputInSubFolder back 2019-03-27 16:26:33 +01:00
Bond_009
ca37ca291f More style changes 2019-03-26 23:06:38 +01:00
Bond_009
93e535d3a1 Trying to make sense of the streaming code 
Mostly small changes as I was looking through the code.

* async void -> async Task
* Properly implemented dispose methods
* Pass the logstream directly to the JobLogger
* Style fixes
 2019-03-26 23:00:14 +01:00
Bond_009
2696ac5eac Lower the amount of running tasks 2019-03-25 21:33:48 +01:00
Phallacy
09921a00aa made password resets an interface and per user 2019-03-22 00:01:23 -07:00
Erwin de Haan
21cc38fcf4 Adjusted AssemblyCopyright attribute values. 2019-03-14 22:17:56 +01:00
Erwin de Haan
ee7bf86e0f Adjusted the Product Name so the User Agent is correct/better. 2019-03-14 22:11:47 +01:00
Vasily
208585d3f6
Merge pull request #1106 from Bond-009/warn2 
More warning fixes
 2019-03-14 19:54:44 +03:00
Bond-009
bf43dc00bb More warning fixes 2019-03-13 22:32:52 +01:00
Bond-009
e64aaebbac Improvements around streams 
* Use ArrayPool instead of allocating new buffers each time
* Remove NetworkStream copy
* Remove some dead code
 2019-03-13 21:11:01 +01:00
Bond-009
decaffed86 Remove EnvironmentInfo 
This moved the last bit of usefulness of EnvironmentInfo into a static
class.
 2019-03-07 22:41:41 +01:00
Vasily
028a98d2c1
Merge pull request #1058 from Bond-009/clean 
Cleanup/simplification
 2019-03-08 00:23:00 +03:00
Bond_009
37ea50a572 Reduce the amount of exceptions thrown 2019-03-07 21:42:56 +01:00
Bond-009
c5fce647de Cleanup/simplification 
* Removed useless copies/allocations
* Reduced unneeded complexity
 2019-03-07 21:13:13 +01:00
Claus Vium
0abe57e930 Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc 2019-03-07 20:16:51 +01:00
Bond-009
e4c5d51860
Update MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs 
Co-Authored-By: cvium <cvium@users.noreply.github.com>
 2019-03-07 19:04:50 +01:00
Claus Vium
394d23a73a Review comments 2019-03-06 19:14:03 +01:00
Claus Vium
78742b8e4c Switch to HeaderNames instead of hardcoded strings (and other header related fixes) 2019-03-05 19:20:28 +01:00
Xu Fasheng
4951ec9814 Fix rmvb video can not play under DLNA 
Or will report "Could not find handler for /videos/xxx/stream.rm" error
in server side.

Test OK with Kodi and gupnp-tools.
 2019-02-28 18:00:25 +08:00
Claus Vium
71ed840944 Simplify websocket listeners 2019-02-27 22:09:22 +01:00
Claus Vium
27e7e792b3 Replace some usage of QueryParamCollection 2019-02-27 14:23:39 +01:00
Claus Vium
4db31acff9 Begin removing System.Net sources 2019-02-26 22:11:21 +01:00
Bond-009
1731bf7372 Remove ordering items 2019-02-26 20:47:23 +01:00
PloughPuff
73c1cdb32a Avoid exceptions due to folder and file not found 
1) Use function to return path to temp transcode path which has benefit of creating temp folder if not exists, thereby avoiding the exception when GetFilePaths is used.
2) Check json files exists before attempting to read from it.  Avoids having to mask FileNotFound exceptions when debugging.
 2019-02-20 13:30:06 +00:00
Vasily
60df855b26
Merge pull request #930 from fruhnow/AuthorizationCheck 
checking user-permission in GetQueryResult
 2019-02-20 14:42:35 +03: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
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
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
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
William Taylor
18ae107ce4 Removed unnecessary configuration options and reduced primitive dependencies 2019-02-17 14:09: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
Bond-009
4811e76860
Merge branch 'master' into perf 2019-02-16 17:05:44 +01:00
Claus Vium
21f0a7e020 Make all class implementing dynamically loaded interfaces public 2019-02-15 23:05:14 +01:00
Bond_009
8d98885cda Less string allocations 2019-02-12 21:06:47 +01:00
Bond_009
7722cb3ffa Some Lists -> IEnumerable 2019-02-12 21:06:47 +01:00
Bond_009
41fb1e5106 Tuple -> ValueTuple 2019-02-12 21:06:47 +01:00
Bond_009
64d5ec12e2 Use HashSets for increased perf 2019-02-12 21:06:47 +01:00
William Lees
db4a72df10 Reduce scope of changes 2019-02-12 09:23:51 +11:00
William Lees
250f03d2d9 add httpClient to more constructors 2019-02-12 00:42:33 +11:00
William Lees
d8cb34dbbc add httpClient to appropriate constructors 2019-02-12 00:24:00 +11:00
Vasily
3a88a3c795
Merge pull request #822 from Bond-009/imagedimensions 
Complete rename ImageSize -> ImageDimensions
 2019-02-08 20:02:25 +03:00
Claus Vium
e449182641 Move import 2019-02-06 22:54:57 +01:00
Claus Vium
fcfe02ee73 Add await to GetCountries in LocalizationService 2019-02-06 22:40:49 +01:00
Bond-009
e216702bcf Complete rename ImageSize -> ImageDimensions 2019-02-05 19:53:50 +01:00
Claus Vium
0ef2b46106 Remove custom Threading 2019-02-05 16:47:50 +01:00
Vasily
83af2db679
Merge pull request #798 from Bond-009/apientrypoint 
Cleanup around the api endpoints
 2019-02-04 14:10:08 +03:00
Joshua M. Boniface
c4f51e16a5
Merge pull request #736 from Bond-009/startasync 
Start startup tasks async
 2019-02-03 22:23:54 -05:00
Joshua M. Boniface
56dcc45dc0
Merge pull request #732 from Bond-009/locale 
Reworked LocalizationManager to load data async
 2019-02-03 22:08:20 -05:00
Bond-009
cb7bffc233 Remove unused string split 2019-02-03 10:44:07 +01:00
Bond-009
da2caa2902 await async functions 2019-02-03 10:44:07 +01:00
Bond-009
ab0e851db9 Cleanup streaming services 2019-02-03 10:44:07 +01:00
Joshua M. Boniface
32f393d57f
Merge pull request #764 from Bond-009/encoding 
Remove dead code, made some functions properly async
 2019-02-02 19:04:10 -05:00
Andrew Rabert
42d5a48491
Merge pull request #788 from Bond-009/warnings 
Fix more warnings
 2019-02-02 14:21:03 -05:00
Bond_009
95ee3c72e3 Properly dispose Tasks 2019-02-02 15:56:54 +01:00
Bond_009
1385d89df6 Remove MoreLINQ 2019-02-02 12:27:06 +01:00
Bond_009
5ac6d0ae59 Fix more warnings 2019-02-01 21:56:50 +01:00
Joshua M. Boniface
c713824bf9
Merge pull request #734 from Bond-009/culture 
Fix more analyzer warnings
 2019-01-31 21:11:13 -05:00
Claus Vium
8985fb8d58 Remove support for games as a media type 2019-01-31 19:04:47 +01:00
Claus Vium
f7a46c7a56 Remove more Connect related stuff 2019-01-31 18:47:50 +01:00
Bond-009
2a1f6361a5
Merge branch 'master' into locale 2019-01-31 18:44:36 +01:00
Bond-009
1ea219bf3f
Merge branch 'master' into culture 2019-01-30 16:57:15 +01:00
Erwin de Haan
f8aff0c51d Fix conditions where the ! was swallowed in #726 2019-01-30 01:02:17 +01:00
Vasily
c8cb908004
Merge pull request #716 from Bond-009/warnings 
Remove more compile time warnings
 2019-01-29 19:32:08 +03:00
Vasily
8487319374
Merge pull request #726 from EraYaN/remove-wrappers-for-system-io 
Clean up IFileSystem wrappers around stdlib.
 2019-01-29 16:50:01 +03:00
Justin Suess
6786dfcabd Made password field non-mandatory upon setup 2019-01-28 17:37:20 -06:00
Justin Suess
f06b9a14f3 Added password as an API field to the Startup/User Service 2019-01-28 17:25:37 -06:00
Erwin de Haan
b9a111432a Unwrapped all /(Write|Read)All(Text|Bytes)/ functions. 2019-01-28 22:10:50 +01:00
Erwin de Haan
581a7fe078 Unwrapped MoveDirectory, DirectoryExists, FileExists & removed MoveFile 2019-01-28 22:10:00 +01:00
Erwin de Haan
d7c6d16250 Unwrapped CreateDirectory and DeleteDirectory 2019-01-28 22:09:56 +01:00
Erwin de Haan
3a831994f6 Unwrapped GetDirectoryName and DirectorySeperatorChar 2019-01-28 22:06:34 +01:00
Bond_009
85a58fd655 Start startup tasks async 2019-01-27 15:40:37 +01:00
Bond_009
a709cbdc64 Fix more analyzer warnings 2019-01-27 12:12:44 +01:00
Bond_009
51edd5d067 Reworked LocalizationManager to load data async 2019-01-27 10:36:05 +01:00
Andrew Rabert
4190410c7e
Merge pull request #710 from Bond-009/spelling 
Fix a spelling mistake
 2019-01-26 14:13:47 -05:00
Bond_009
883575893b Change image dimentions from double to int 
Rename ImageSize -> ImageDimensions
 2019-01-26 13:16:47 +01:00
Erwin de Haan
d1a0497f55 Revert "Merge pull request #452 from Bond-009/activitydb" 
This reverts commit 48ad18d12b, reversing
changes made to fe197415ca.
 2019-01-25 23:32:06 +01:00
Bond_009
ded9dee22c Remove more compile time warnings 2019-01-25 23:05:01 +01:00
Bond_009
eaa6cb0ddc Fix a spelling mistake 2019-01-25 22:27:33 +01:00
Bond_009
905a253ff5 Suffix async methods with Async 2019-01-23 19:09:34 +01:00
Andrew Rabert
3d01aa1ae4 Merge pull request #656 from hawken93/more_logging 
Do some logging in MediaInfoService
 2019-01-22 19:38:43 -05:00
hawken
07cba6cbcf Do some logging in MediaInfoService 2019-01-22 10:24:00 +00:00
Andrew Rabert
13f1ea2c19 Merge pull request #664 from jellyfin/revert-639-ffmpeg4.1 
Revert "Fix segment_time_delta for ffmpeg 4.1"
 2019-01-21 20:21:36 -05:00
Andrew Rabert
9ad182502f Merge pull request #661 from Bond-009/streamstate 
Fix NullRef from progress report
 2019-01-21 20:05:43 -05:00
Joshua M. Boniface
b2767eceff Revert "Fix segment_time_delta for ffmpeg 4.1" 2019-01-21 19:29:47 -05:00
Bond_009
73df5bdbe9 Fix NullRef 2019-01-21 23:50:47 +01:00
Joshua M. Boniface
3518400b22 Merge branch 'master' into release-10.1.0 2019-01-20 23:48:23 -05:00
Tthecreator
d02642bf7b Fixed bug where the server would eat up ram with subtitles request 2019-01-21 00:38:01 +01:00
Andrew Rabert
a1fcf4ea0d Merge pull request #613 from MatMaul/mediaencoding-dev 
Update MediaEncoding
 2019-01-20 18:11:51 -05:00
Mathieu Velten
da16de48aa Revert back to 10e57ce8d21b4516733894075001819f3cd6db6b for MediaEncoding 
Remove some duplicate code that were causing warnings
 2019-01-20 22:50:09 +01:00
Bond_009
c27aff1c63 Fix segment_time_delta for ffmpeg 4.1 2019-01-20 21:56:50 +01:00
Andrew Rabert
6561021926 Merge pull request #582 from nvllsvm/image 
Replace custom image parser with Skia
 2019-01-19 22:42:46 -05:00
Andrew Rabert
449dd1a6a2 Remove allowSlowMethods from image processing 2019-01-19 22:33:55 -05:00
Andrew Rabert
8de4eb7d19 Rename ApplicationSemanticVersion to ApplicationVersion 2019-01-19 21:35:33 -05:00
Andrew Rabert
8a5198e6a3 Remove ApplicationVersion 2019-01-19 21:34:47 -05:00
Erwin de Haan
924ec0c191 Revert Jellyfin.Versioning, Update all versions and user agents. 2019-01-20 01:12:44 +01:00
Erwin de Haan
bb8df8dfa0 Updates reported version in System/Info* set of endpoints. 
Added ProductName and ServerVersion to API.

Added build version and build step. Addressed issues wtih indentation.

Made the BuildVersion an actual object. This lets up link to the github page of that commit.

Fixed class method type and styled link.

Fixed languages and split out the information in the UI.

Moved update-version script and gave it executable permissions. Windows correctly finds the .bat file. And linux takes the one without extension.

Removed tempfiles from replace sessions from csproj.

Updated version generation scripts. Will also work with pre existing version files. (Source tarballs etc.)

Added simple replace for ssh github links.

Add execute rights to update-version.

Wrapped long line in ApplicationHost.cs

Fixed some small issues.

Fixed some small issues, and flipped some if's around.

Converted parameter names to camelBack casing.

Sealed the attribute class.

Removed MPLv2 license.

Fixed file headers.

Added newline.

Moved links in *.csproj files as well.

Fix issues caused by rebase auto merging.

Removed default constructor and added init values to properties, also hid the Remote value form API.
 2019-01-20 00:28:48 +01:00
Erwin de Haan
c5430f86b0 Fixed csproj and xml identation. 2019-01-19 15:01:16 +01:00
Erwin de Haan
38f96af079 Reformat JustAMan review pt2 changes 
Refs #575
 2019-01-17 20:24:39 +01: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
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
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