Commit Graph

10530 Commits

Author SHA1 Message Date
Luke
1cd5e20871 Merge pull request #2425 from MediaBrowser/beta
Beta
2017-01-26 15:40:15 -05:00
Luke Pulverenti
0d0e4ad695 fix merge conflict 2017-01-26 15:40:00 -05:00
Luke Pulverenti
3ff216f05a update ShortOverview 2017-01-26 15:27:12 -05:00
Luke Pulverenti
88d9b3d09d remove localized guids 2017-01-26 15:10:19 -05:00
Luke
9ebf9162ab Merge pull request #2424 from MediaBrowser/dev
Dev
2017-01-26 14:46:59 -05:00
Luke Pulverenti
aa881a9bfa Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2017-01-26 14:46:38 -05:00
Luke
44d41ad74c Merge pull request #2357 from quentinus95/patch-1
fix wrong start url in manifest.json
2017-01-26 14:44:46 -05:00
Luke
e2ae7f24f2 Merge pull request #2423 from MediaBrowser/dev
update mac project
2017-01-26 14:42:55 -05:00
Luke
b0c1f7f140 update mac project 2017-01-26 14:41:57 -05:00
Luke Pulverenti
8cf5544dac 3.1.286 2017-01-26 13:52:11 -05:00
Luke
cafb492936 Merge pull request #2422 from MediaBrowser/dev
fix remote control nav
2017-01-26 13:51:49 -05:00
Luke
6f93e605cf Merge pull request #2421 from MediaBrowser/dev
Dev
2017-01-26 13:41:36 -05:00
Luke Pulverenti
db4290c74c add error handling 2017-01-26 13:41:12 -05:00
Luke Pulverenti
045fdaf387 update live stream bitrates 2017-01-26 01:26:58 -05:00
Luke Pulverenti
15d4de2fee 3.1.285 2017-01-25 15:27:24 -05:00
Luke
d0f58ac0bf Merge pull request #2420 from MediaBrowser/dev
update  m3u parsing
2017-01-25 15:25:50 -05:00
Luke Pulverenti
8f780269cb update m3u parsing 2017-01-25 15:14:47 -05:00
Luke Pulverenti
9a3aa83ce3 3.1.284 2017-01-25 03:42:38 -05:00
Luke
a64d69af16 Merge pull request #2419 from MediaBrowser/dev
Dev
2017-01-25 03:16:31 -05:00
Luke Pulverenti
cf470529b1 update video osd 2017-01-25 02:04:34 -05:00
Luke
5cbed08e02 Merge pull request #2417 from MediaBrowser/dev
add missing file
2017-01-24 16:25:38 -05:00
Luke Pulverenti
1aff43059a add missing file 2017-01-24 16:25:17 -05:00
Luke Pulverenti
0173aad9c8 3.1.283 2017-01-24 16:22:44 -05:00
Luke
8132e3e03b Merge pull request #2416 from MediaBrowser/dev
Dev
2017-01-24 16:22:07 -05:00
Luke Pulverenti
6ce6ed7d9c force guide refresh 2017-01-24 16:21:36 -05:00
Luke Pulverenti
e140da0ddf update .net core project 2017-01-24 15:40:40 -05:00
Luke Pulverenti
b9f758e14d reduce traffic from play to feature 2017-01-24 14:54:18 -05:00
Luke
9ac5d55ade Merge pull request #2415 from MediaBrowser/dev
update m3u parsing
2017-01-24 01:20:47 -05:00
Luke Pulverenti
23070fa67c update m3u parsing 2017-01-24 01:20:06 -05:00
Luke Pulverenti
2c447985f4 3.1.282 2017-01-24 01:14:48 -05:00
Luke
d4e267a62d Merge pull request #2414 from MediaBrowser/dev
Dev
2017-01-24 01:14:24 -05:00
Luke Pulverenti
2ebcbdece8 update now playing screen 2017-01-24 00:52:47 -05:00
Luke Pulverenti
7c3ec71d6f Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2017-01-23 16:51:38 -05:00
Luke Pulverenti
a3b9d33248 key m3u based on tvgid 2017-01-23 16:51:23 -05:00
Luke
90e86c8455 update mac project 2017-01-23 14:33:50 -05:00
Luke Pulverenti
7abbdfb768 3.1.281 2017-01-23 14:07:21 -05:00
Luke
1e2a388be1 Merge pull request #2413 from MediaBrowser/dev
Dev
2017-01-23 14:06:45 -05:00
Luke Pulverenti
dac538e812 update translations 2017-01-22 18:16:10 -05:00
Luke Pulverenti
e97fff049d update project 2017-01-22 18:13:50 -05:00
Luke Pulverenti
9c6397a295 3.1.280 2017-01-21 18:40:05 -05:00
Luke
e8d370406b Merge pull request #2408 from MediaBrowser/dev
Dev
2017-01-21 18:39:40 -05:00
Luke Pulverenti
ceab0be20b move metadata language to per library 2017-01-21 18:37:38 -05:00
Luke Pulverenti
2ef30a3ba8 update program titles 2017-01-21 15:27:07 -05:00
Luke Pulverenti
0bf95da493 update dlna profiles 2017-01-21 15:20:15 -05:00
Luke Pulverenti
5dc625663d 3.1.279 2017-01-20 13:49:03 -05:00
Luke
d0ce1cc319 Merge pull request #2406 from MediaBrowser/dev
Dev
2017-01-20 13:48:32 -05:00
Luke Pulverenti
e4fd626d1c resolve local trailers not used for cinema mode 2017-01-20 13:30:22 -05:00
Luke Pulverenti
8d668095bb add IsRemote property 2017-01-20 12:53:48 -05:00
Luke Pulverenti
4f5151023a 3.1.278 2017-01-19 13:51:52 -05:00
Luke
d097bb77cd Merge pull request #2405 from MediaBrowser/dev
update home page section loading
2017-01-19 13:51:21 -05:00