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

2651 Commits

Author SHA1 Message Date
Andrew Rabert
fc439cc02a
Merge pull request #1448 from joshuaboniface/nice-userconfig-paths 
Use the username for the user config path
 2019-06-24 12:54:24 -04:00
dkanada
1b2621cd30
Merge pull request #1454 from Bond-009/webresource 
Simplify file serving code
 2019-06-21 23:33:37 -07:00
dkanada
dbc2cda9d4
Merge pull request #1369 from teacupx/master 
Enable Exynos MFC encoder and fix transcoding bitrate control
 2019-06-20 16:55:09 -07:00
dkanada
65fa61a636 add comment explaining GetMinBitrate 2019-06-20 16:44:27 -07:00
Anthony Lavado
b25c08e79a
Merge pull request #1156 from Bond-009/sep 
Small cleanups here and there
 2019-06-13 22:27:00 -04: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
Bond_009
253e72f667 Simplify file serving code 2019-06-10 00:53:16 +02:00
Joshua M. Boniface
d1d0ddf62f Use the username for the user config path 
Use the username to construct the UserConfigurationDirectory,
instead of the user ID, and move the old ID-based path to the new
path if needed when loading (temporary transitional code). Removes
administrator guesswork as to what user each directory belongs to,
which I found very annoying when investigating user configs.
 2019-06-08 23:54:26 -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
Bond-009
ce1fa42f9d
Merge branch 'master' into tasks 2019-06-01 17:06:01 +02:00
DrPandemic
69ee49bee6 Format correctly the PIN when updating it 2019-05-25 13:46:55 -04:00
Bond-009
2d011b781e
Merge pull request #1383 from jellyfin/release-10.3.z 
Backmerge for Release 10.3.3
 2019-05-18 12:56:42 +02:00
Claus Vium
0ef52c739e
Review changes 
Untested
 2019-05-16 07:27:38 +02:00
JMCC
012e4a3e63 Fix transcode bitrate control 2019-05-11 17:19:20 +02:00
Claus Vium
b8a09339cd Enforce extras folder structure according to Emby's wiki 2019-05-02 08:14:00 +02:00
Claus Vium
c1daea0ec7 Change owner and parent id of extras to the main media item 2019-05-01 07:47:22 +02:00
Bond-009
2f33e99006 Speed up DeepCopy 2019-04-02 18:17:50 +02:00
Joshua M. Boniface
72dd609109
Merge pull request #1149 from LogicalPhallacy/ImprovedPasswordReset 
Adds per user password reset
 2019-03-29 18:26:30 -04:00
Bond_009
b647959ec4 Add EnableOutputInSubFolder back 2019-03-27 16:26:33 +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
7343e07fe5 Fix build error 2019-03-26 19:31:06 +01:00
Bond_009
2696ac5eac Lower the amount of running tasks 2019-03-25 21:33:48 +01:00
Bond-009
6566c91360 Seperate changes from #1023 
The unrelated changes from #1023 (and more)
 2019-03-25 21:27:03 +01:00
Phallacy
09921a00aa made password resets an interface and per user 2019-03-22 00:01:23 -07:00
Bond_009
d5f080fefb Check before flushing ffmpeg log 
The stream could have been diposed while writing.
 2019-03-15 17:58:34 +01: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
Bond-009
80fb3dc2cb
Fix error 2019-03-08 06:36:00 +01:00
Vasily
fcee64df09
Merge pull request #1069 from Bond-009/fix 
Quick nullref fix
 2019-03-08 00:58:52 +03:00
Bond-009
4625592a83 Quick nullref fix 2019-03-07 22:52:41 +01:00
Claus Vium
e3b844b5aa Add urlprefixes during init 2019-03-07 22:49: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
Claus Vium
8c609bc9ce Reduce aspnet imports 2019-03-07 19:04:09 +01:00
Vasily
a4b52b7264
Merge pull request #844 from ploughpuff/ffmpeg 
Reworked FFmpeg path discovery and always display to user
 2019-03-07 17:23:06 +03:00
Vasily
2242c8d793
Merge pull request #915 from cvium/remove_encryptionmanager 
Remove IEncryptionManager
 2019-03-06 15:56:15 +03:00
PloughPuff
2617a49b78 Renamed Init() to SetFFmpegPath() 2019-03-05 21:29:15 +00:00
PloughPuff
ed69e690b8 Review comments 
Address review comments from JustAMan, Bond-009 and cvium.
 2019-03-05 21:29:15 +00:00
Claus Vium
df92df7bd6 Remove BOM 2019-03-05 19:22:41 +01:00
Claus Vium
17ca23d73b Don't dispose the connection 2019-03-05 07:41:41 +01:00
Claus Vium
557c4d065d Review comments 2019-03-04 19:55:59 +01:00
Claus Vium
fb1de5a921 Remove more cruft and add the beginnings of a socket middleware 2019-02-27 23:22:55 +01:00
Claus Vium
71ed840944 Simplify websocket listeners 2019-02-27 22:09:22 +01:00
Claus Vium
e47d121985 Fix websockets 2019-02-27 21:40:47 +01:00
Vasily
8c2af50170
Merge pull request #1011 from Bond-009/order 
Don't try to order the response the same as the request
 2019-02-27 17:29:12 +03:00
Claus Vium
27e7e792b3 Replace some usage of QueryParamCollection 2019-02-27 14:23:39 +01:00
Joshua M. Boniface
9651a78b0c
Merge pull request #977 from Lynxy/genpts 
Always set ffmpeg flag +genpts when video stream is being copied
 2019-02-27 00:52:51 -05:00