Luke Pulverenti
|
afbce667bf
|
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
|
2015-12-22 12:35:12 -05:00 |
|
Luke
|
fabe9b1caa
|
Merge pull request #1351 from MediaBrowser/master
update BdInfo probing
|
2015-12-22 12:35:15 -05:00 |
|
Luke Pulverenti
|
f6491c69fd
|
update BdInfo probing
|
2015-12-22 12:34:39 -05:00 |
|
Luke Pulverenti
|
0540f1b492
|
update bdinfo
|
2015-12-22 12:27:04 -05:00 |
|
Luke
|
2a3609106c
|
Merge pull request #1350 from MediaBrowser/master
update MovieDbPersonProvider
|
2015-12-22 11:39:00 -05:00 |
|
Luke Pulverenti
|
d5a4a9424f
|
update MovieDbPersonProvider
|
2015-12-22 11:38:08 -05:00 |
|
Luke Pulverenti
|
31412a8d69
|
version bump
|
2015-12-21 13:00:18 -05:00 |
|
Luke
|
887c09e737
|
Merge pull request #1346 from MediaBrowser/master
merge from master
|
2015-12-21 12:50:25 -05:00 |
|
Luke Pulverenti
|
7dffc197da
|
fix merge conflict
|
2015-12-21 12:50:05 -05:00 |
|
Luke Pulverenti
|
83a2823c17
|
3.0.5781.9
|
2015-12-21 12:48:45 -05:00 |
|
Luke Pulverenti
|
6b05f526a0
|
fix require path
|
2015-12-21 12:48:14 -05:00 |
|
Luke Pulverenti
|
31565d2c77
|
adjust ffmpeg validator
|
2015-12-21 11:41:32 -05:00 |
|
Luke Pulverenti
|
99d7932237
|
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
|
2015-12-21 11:10:15 -05:00 |
|
Luke Pulverenti
|
c6a01e0370
|
allow separate customization of ffmpeg/ffprobe paths
|
2015-12-21 11:10:06 -05:00 |
|
Luke Pulverenti
|
e290f24718
|
fix 64-bit windows build
|
2015-12-21 10:28:47 -05:00 |
|
Luke
|
0c203edf7b
|
update components
|
2015-12-20 13:21:29 -05:00 |
|
Luke Pulverenti
|
3061e6c876
|
3.0.5781.8
|
2015-12-20 11:26:50 -05:00 |
|
Luke
|
b14ca8863f
|
Merge pull request #1345 from MediaBrowser/master
update theme
|
2015-12-20 11:22:17 -05:00 |
|
Luke
|
a3f331c9a6
|
Merge pull request #1344 from MediaBrowser/master
update theme
|
2015-12-20 11:21:17 -05:00 |
|
Luke
|
70e8cca670
|
Merge pull request #1343 from MediaBrowser/master
update theme
|
2015-12-20 11:19:18 -05:00 |
|
Luke Pulverenti
|
0eaeaa45be
|
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
|
2015-12-19 23:44:30 -05:00 |
|
Luke
|
616f1b10cc
|
Merge pull request #1342 from MediaBrowser/master
update theme
|
2015-12-19 23:41:24 -05:00 |
|
Luke Pulverenti
|
fae4079a69
|
restore changes
|
2015-12-19 23:37:59 -05:00 |
|
Luke
|
52f4962ca7
|
Merge pull request #1341 from MediaBrowser/master
update theme
|
2015-12-19 23:36:31 -05:00 |
|
Luke Pulverenti
|
0948e8e1c5
|
fix merge conflict
|
2015-12-19 23:36:16 -05:00 |
|
Luke Pulverenti
|
aced2dd6fe
|
update theme
|
2015-12-19 23:35:22 -05:00 |
|
Luke
|
022f380c5a
|
Merge pull request #1340 from MediaBrowser/master
remove ImageType icon
|
2015-12-19 22:29:28 -05:00 |
|
Luke
|
5065acc821
|
Merge pull request #1339 from MediaBrowser/master
fix file deletion
|
2015-12-19 15:23:46 -05:00 |
|
Luke Pulverenti
|
1c28345a19
|
fix file deletion
|
2015-12-19 15:22:08 -05:00 |
|
Luke Pulverenti
|
59277211c7
|
update interlaced detection
|
2015-12-19 13:33:40 -05:00 |
|
Luke Pulverenti
|
3c433e95b9
|
update interlaced detection
|
2015-12-19 13:29:53 -05:00 |
|
Luke
|
1f62c42547
|
Merge pull request #1338 from MediaBrowser/master
merge from master
|
2015-12-19 13:23:24 -05:00 |
|
Luke Pulverenti
|
255747337a
|
fix merge conflict
|
2015-12-19 13:23:13 -05:00 |
|
Luke Pulverenti
|
bd201f5120
|
sync media encoder
|
2015-12-19 13:20:31 -05:00 |
|
Luke
|
32dfef320e
|
Merge pull request #1337 from MediaBrowser/mediainfo
Mediainfo
|
2015-12-19 13:13:35 -05:00 |
|
Luke Pulverenti
|
4595c3854c
|
update interlaced detection formats
|
2015-12-19 13:02:32 -05:00 |
|
Luke Pulverenti
|
8d6acbbc68
|
adjust logging
|
2015-12-19 12:50:44 -05:00 |
|
Luke Pulverenti
|
6ea8ef9107
|
restore changes
|
2015-12-19 12:48:42 -05:00 |
|
Luke
|
acd8b0d7a8
|
Merge pull request #1336 from MediaBrowser/mediainfo
Mediainfo
|
2015-12-19 12:46:03 -05:00 |
|
Luke Pulverenti
|
949d23f06a
|
fix merge conflict
|
2015-12-19 12:45:50 -05:00 |
|
Luke Pulverenti
|
5fffd38963
|
detect interlaced
|
2015-12-19 12:44:38 -05:00 |
|
Luke Pulverenti
|
5c610d71f6
|
remove call from probe result normalizer
|
2015-12-19 11:46:32 -05:00 |
|
Luke
|
8211e3daeb
|
Merge pull request #1335 from MediaBrowser/mediainfo
update solution files
|
2015-12-19 11:03:09 -05:00 |
|
Luke Pulverenti
|
940702aa0b
|
update solution files
|
2015-12-19 11:02:47 -05:00 |
|
Luke
|
0a3b8d9522
|
Merge pull request #1334 from MediaBrowser/mediainfo
remove MediaInfo
|
2015-12-19 10:58:50 -05:00 |
|
Luke Pulverenti
|
bf983f76db
|
fix merge conflict
|
2015-12-19 10:58:32 -05:00 |
|
Luke Pulverenti
|
b51ea9e4fa
|
fix merge conflict
|
2015-12-19 10:57:47 -05:00 |
|
Luke Pulverenti
|
5963affec5
|
fix merge conflict
|
2015-12-19 10:56:07 -05:00 |
|
Luke Pulverenti
|
ca52e8c23b
|
fix merge conflict
|
2015-12-19 10:54:44 -05:00 |
|
Luke Pulverenti
|
6414fc9486
|
remove MediaInfo
|
2015-12-19 10:51:38 -05:00 |
|