Commit Graph

9326 Commits

Author SHA1 Message Date
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
Luke
6949e502dd Merge pull request #1333 from MediaBrowser/master
update translations
2015-12-18 23:31:13 -05:00
Luke Pulverenti
be664f93c6 update translations 2015-12-18 23:30:38 -05:00
Luke
90d5604392 Merge pull request #1332 from MediaBrowser/master
fix recording popup
2015-12-18 13:06:15 -05:00
Luke
7906adc379 Merge pull request #1331 from MediaBrowser/master
require admin for edit buttons
2015-12-18 12:38:32 -05:00
Luke
be5f2e5950 Merge pull request #1330 from MediaBrowser/master
require admin for refresh button
2015-12-18 12:37:10 -05:00
Luke Pulverenti
62e32a6ed9 update components 2015-12-18 12:31:11 -05:00
Luke
22523484e4 Merge pull request #1329 from MediaBrowser/master
merge from master
2015-12-18 12:34:05 -05:00
Luke Pulverenti
304a04fc5e fix merge conflict 2015-12-18 12:30:07 -05:00
Luke
e2041c049b Merge pull request #1328 from MediaBrowser/master
fix tvdb lookup by imdb id
2015-12-18 11:48:04 -05:00
Luke Pulverenti
f2c1edb11d 3.0.5781.7 2015-12-18 11:45:45 -05:00
Luke Pulverenti
73b1e227d3 fix tvdb lookup by imdb id 2015-12-18 11:43:42 -05:00
Luke
f9dca3b241 Merge pull request #1326 from MediaBrowser/master
merge from master
2015-12-17 12:10:59 -05:00
Luke Pulverenti
791c6cbce1 revert roku change 2015-12-16 21:17:40 -05:00
Luke Pulverenti
88428cf5f7 update components 2015-12-16 16:27:19 -05:00
Luke Pulverenti
14d2d7ab32 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-12-16 00:31:54 -05:00
Luke
9db23837ac Merge pull request #1324 from MediaBrowser/master
merge from master
2015-12-16 00:35:24 -05:00
Luke Pulverenti
a41ec47579 update project 2015-12-16 00:30:51 -05:00
Luke Pulverenti
22c15667b9 get api libs from bower 2015-12-16 00:30:14 -05:00
Luke Pulverenti
bfda416579 update resizing params 2015-12-16 00:13:16 -05:00
Luke
c7d433009b Merge pull request #1323 from MediaBrowser/master
add recording toast
2015-12-15 16:02:55 -05:00
Luke
6e9f147dda Merge pull request #1322 from MediaBrowser/master
rework dialog headers
2015-12-15 15:14:45 -05:00
Luke
26798b99ce Merge pull request #1321 from MediaBrowser/master
adjust padding
2015-12-15 14:32:36 -05:00
Luke
3709d75bbc Merge pull request #1320 from MediaBrowser/master
animate recording fields
2015-12-15 14:19:56 -05:00
Luke
c3b9858c57 Merge pull request #1319 from MediaBrowser/master
update header text
2015-12-15 13:33:17 -05:00
Luke
d039344e46 Merge pull request #1318 from MediaBrowser/master
schedule recordings with a dialog
2015-12-15 13:29:15 -05:00
Luke Pulverenti
88126ac681 schedule recordings with a dialog 2015-12-15 13:24:41 -05:00
Luke
507688fdf6 Merge pull request #1317 from MediaBrowser/master
fixes #1313 - Button issue
2015-12-14 23:59:32 -05:00
Luke
0c5d21832e Merge pull request #1316 from MediaBrowser/master
update mobile chrome playback
2015-12-14 17:58:15 -05:00
Luke Pulverenti
b7fd6df165 version bump 2015-12-14 16:57:04 -05:00
Luke
d85c3f3a33 Merge pull request #1314 from MediaBrowser/master
merge from master
2015-12-14 16:59:03 -05:00