lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,895 Commits 2 Branches 0 Tags 64 MiB
6f20a8ca05
Commit Graph

8895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Pulverenti
0a5db9f2d7 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-07-03 20:42:22 -04:00
Luke
3407b5a340 Merge pull request #1921 from MediaBrowser/beta 
Beta
 2016-07-03 20:27:39 -04:00
Luke
e50ce1dfbd Merge pull request #1920 from MediaBrowser/dev 
Dev
 2016-07-03 20:27:25 -04:00
Luke
6e1ba4e3cc Merge pull request #1918 from phantom-voltage/dev 
Changed to a valid preset for h264_nvenc
 2016-07-03 20:27:06 -04:00
Luke Pulverenti
ad70469f82 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-07-03 20:25:56 -04:00
Luke Pulverenti
598aeb1988 3.0.5984 2016-07-03 20:25:47 -04:00
Luke
e1bdca9f1f Merge pull request #1919 from MediaBrowser/beta 
Beta
 2016-07-03 20:25:34 -04:00
Luke Pulverenti
ac62ba9e19 fix merge conflict 2016-07-03 20:24:41 -04:00
Luke Pulverenti
bb90157b07 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-07-03 20:19:30 -04:00
Luke Pulverenti
b73e733a70 3.1.56 2016-07-03 20:19:21 -04:00
Luke
ebc37b8d37 Merge pull request #1917 from MediaBrowser/dev 
update default cache size
 2016-07-03 20:19:06 -04:00
phantom
98e3aec676 Changed to a valid preset for h264_nvenc 2016-07-03 17:16:00 -07:00
Luke Pulverenti
fcc64173f6 update default cache size 2016-07-03 20:14:28 -04:00
Luke Pulverenti
a38c6b2662 3.1.55 2016-07-03 19:55:05 -04:00
Luke
b4b947c6e3 Merge pull request #1916 from MediaBrowser/dev 
Dev
 2016-07-03 19:55:07 -04:00
Luke Pulverenti
986cdc429f update db upgrade 2016-07-03 19:54:19 -04:00
Luke Pulverenti
373448675b update components 2016-07-03 19:05:13 -04:00
Luke Pulverenti
338ce07118 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-07-02 22:47:51 -04:00
Luke Pulverenti
08e58886f7 update metadata editor 2016-07-02 22:47:39 -04:00
Luke
3be72e195e Merge pull request #1915 from MediaBrowser/beta 
Beta
 2016-07-02 18:06:11 -04:00
Luke
c35baeb6c0 Merge pull request #1914 from MediaBrowser/dev 
update mac project
 2016-07-02 18:05:57 -04:00
Luke
2b843887e7 update mac project 2016-07-02 18:05:27 -04:00
Luke Pulverenti
2faa664ae9 Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-07-02 17:51:33 -04:00
Luke
7394ac0605 Merge pull request #1913 from MediaBrowser/beta 
Beta
 2016-07-02 17:51:27 -04:00
Luke Pulverenti
c0f43d9abc 3.0.5983 2016-07-02 17:51:24 -04:00
Luke Pulverenti
db99a9840b fix merge conflict 2016-07-02 17:50:58 -04:00
Luke Pulverenti
ce915f89ad 3.1.54 2016-07-02 17:47:40 -04:00
Luke
4413021213 Merge pull request #1912 from MediaBrowser/dev 
fix interlace detection stderr
 2016-07-02 17:47:05 -04:00
Luke Pulverenti
dc49059f1b fix interlace detection stderr 2016-07-02 17:45:20 -04:00
Luke
bdcfa38104 Merge pull request #1911 from MediaBrowser/dev 
Dev
 2016-07-02 17:35:30 -04:00
Luke Pulverenti
9b892e8608 3.1.53 2016-07-02 00:27:27 -04:00
Luke
1eea144e00 Merge pull request #1910 from MediaBrowser/dev 
fix probe stdout
 2016-07-02 00:26:43 -04:00
Luke Pulverenti
1295d1e694 fix probe stdout 2016-07-02 00:25:34 -04:00
Luke Pulverenti
fb7a893a5e 3.1.52 2016-07-01 22:29:01 -04:00
Luke
4a3630a223 Merge pull request #1909 from MediaBrowser/dev 
Dev
 2016-07-01 22:19:38 -04:00
Luke Pulverenti
22601f0a2e reduce stdout redirection 2016-07-01 22:16:05 -04:00
Luke Pulverenti
3043d0687f disable omdb people for now 2016-07-01 22:15:56 -04:00
Luke
e18389d239 Merge pull request #1907 from softworkz/OmdbImprovements 
Omdb Improvements
 2016-07-01 18:28:36 -04:00
softworkz
c022b728f8 OMDB improvements 
- Improved parsing of production year (cases like '2001-2003')
- Parse writer field as person
- Parse director field as person
- Parse actors fields as persons
 2016-07-01 22:06:04 +02:00
Luke Pulverenti
c100f0818c update startup wizard 2016-07-01 12:14:17 -04:00
Luke Pulverenti
ed690061ab 3.1.51 2016-07-01 11:52:57 -04:00
Luke
d364ddd429 Merge pull request #1906 from MediaBrowser/dev 
next up upgrade fixes
 2016-07-01 11:52:05 -04:00
Luke Pulverenti
0920c9b3a1 next up upgrade fixes 2016-07-01 11:51:35 -04:00
Luke
9cf815214f Merge pull request #1905 from MediaBrowser/dev 
reduce repeated deserialization
 2016-07-01 11:21:26 -04:00
Luke Pulverenti
43bcf7ba1d reduce repeated deserialization 2016-07-01 11:04:08 -04:00
Luke Pulverenti
7a39ce558a 3.0.5981 2016-07-01 02:11:16 -04:00
Luke
7031a6ef87 Merge pull request #1904 from MediaBrowser/beta 
Beta
 2016-07-01 02:11:01 -04:00
Luke Pulverenti
05b0527894 fix merge conflict 2016-07-01 02:10:25 -04:00
Luke Pulverenti
54884d1168 3.1.50 2016-06-30 23:06:53 -04:00
Luke
d92bcd42c6 Merge pull request #1903 from MediaBrowser/dev 
Dev
 2016-06-30 23:06:40 -04:00