Commit graph

10761 commits

Author SHA1 Message Date
Luke Pulverenti 3e29d73d0c fix merge conflict 2017-05-06 16:20:07 -04:00
Luke Pulverenti 423045dd56 3.2.13 2017-04-21 00:02:43 -04:00
Luke f525f5a89e Merge pull request #2591 from MediaBrowser/beta
Beta
2017-04-20 23:49:50 -04:00
Luke Pulverenti 5dca8cb077 fix merge conflicts 2017-04-20 23:49:33 -04:00
Luke b9fe720e73 Merge pull request #2590 from MediaBrowser/dev
update live tv screens
2017-04-20 23:47:46 -04:00
Luke Pulverenti 4269190ca3 update live tv screens 2017-04-20 23:47:17 -04:00
Luke 389baf67b6 Merge pull request #2589 from MediaBrowser/dev
Dev
2017-04-20 16:18:18 -04:00
Luke Pulverenti 7ea3719a2d 3.2.12.11 2017-04-20 16:17:52 -04:00
Luke Pulverenti d0424ac6df Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2017-04-20 16:16:55 -04:00
Luke 9c390ad6b4 update mac project 2017-04-19 13:50:03 -04:00
Luke 3cd37ed3c7 Merge pull request #2586 from MediaBrowser/dev
Dev
2017-04-19 12:57:53 -04:00
Luke Pulverenti 0dad3d0e71 3.2.12.10 2017-04-19 12:57:23 -04:00
Luke Pulverenti 099f8037c5 don't read user data from nfo's anymore 2017-04-19 12:57:06 -04:00
Luke 8ca84af792 Merge pull request #2585 from MediaBrowser/dev
Dev
2017-04-18 16:12:23 -04:00
Luke Pulverenti b51beedd94 3.2.12.9 2017-04-18 16:11:51 -04:00
Luke Pulverenti 7147bec7d8 add landing screen settings 2017-04-18 16:11:42 -04:00
Luke Pulverenti 310f0e2811 fixes #2008 - Collections doesn't respect UserPolicy 2017-04-18 15:22:17 -04:00
Luke Pulverenti 4d7d8961b4 update encoding detection 2017-04-18 01:53:39 -04:00
Luke f0f3ca8c18 Merge pull request #2584 from MediaBrowser/dev
Dev
2017-04-17 16:33:52 -04:00
Luke Pulverenti 6a66aef608 3.2.12.8 2017-04-17 16:33:29 -04:00
Luke Pulverenti eb9b63c7a7 update playback progress reporting 2017-04-17 16:33:07 -04:00
Luke Pulverenti 561028c907 update automated checkins 2017-04-17 15:01:16 -04:00
Luke Pulverenti 0b5019ed1b support automatic progress reporting 2017-04-17 14:40:42 -04:00
Luke 315541a686 Merge pull request #2582 from MediaBrowser/dev
Dev
2017-04-16 21:46:07 -04:00
Luke Pulverenti eddcc46602 improve performance of getting channel list 2017-04-16 21:45:44 -04:00
Luke 8c4e69e1c6 Merge pull request #2580 from MediaBrowser/dev
Dev
2017-04-15 15:46:46 -04:00
Luke Pulverenti 25e6e0a572 3.2.12.6 2017-04-15 15:46:24 -04:00
Luke Pulverenti eedf62d80d update keep up to deletion 2017-04-15 15:46:07 -04:00
Luke Pulverenti 8eb4c034b4 update audio sync params 2017-04-15 15:45:33 -04:00
Luke 072d2c63a5 Merge pull request #2579 from MediaBrowser/dev
Dev
2017-04-13 15:00:48 -04:00
Luke Pulverenti 508edad222 3.2.12.5 2017-04-13 14:59:46 -04:00
Luke Pulverenti 4fa90701fd fix incorrect level on encoding command line 2017-04-13 14:57:57 -04:00
Luke Pulverenti dd715fbcc7 use alameda 2017-04-13 14:57:24 -04:00
Luke 20db097869 Merge pull request #2577 from MediaBrowser/dev
Dev
2017-04-12 13:10:10 -04:00
Luke Pulverenti 46626dda12 3.2.12.4 2017-04-12 13:09:44 -04:00
Luke Pulverenti 4154fdf9c6 update omdb info parsing 2017-04-12 13:09:12 -04:00
Luke Pulverenti 958b32b714 update dlna profiles 2017-04-11 20:04:18 -04:00
Luke Pulverenti 118c702c5c fixes #2572 - Issues found by PVS-Studio 2017-04-11 13:04:13 -04:00
Luke e4be279fc7 Merge pull request #2575 from MediaBrowser/dev
Dev
2017-04-11 12:41:18 -04:00
Luke Pulverenti 08c88f5c32 3.2.12.3 2017-04-11 12:40:54 -04:00
Luke d01c79b875 Merge pull request #2571 from MediaBrowser/dev
Dev
2017-04-09 21:52:03 -04:00
Luke Pulverenti 34c5aab607 3.2.12.2 2017-04-09 21:51:36 -04:00
Luke Pulverenti e56faea17a update vsync 2017-04-09 17:38:59 -04:00
Luke Pulverenti 8c487250e0 update segment responses 2017-04-09 15:49:18 -04:00
Luke Pulverenti 885d1f55a6 3.2.12 2017-04-08 14:53:12 -04:00
Luke Pulverenti 1c0e23fd7a update segment result 2017-04-08 14:52:49 -04:00
Luke Pulverenti 2f0c2b4c66 update linux iso mounter 2017-04-08 14:33:04 -04:00
Luke e25c538ac7 Merge pull request #2569 from MediaBrowser/dev
Dev
2017-04-08 14:32:24 -04:00
Luke Pulverenti 78eebc0450 3.2.12.1 2017-04-08 14:31:43 -04:00
Luke Pulverenti 48ad0ad93b update linux iso mounter 2017-04-08 14:31:18 -04:00