Commit Graph

10102 Commits

Author SHA1 Message Date
Luke
7b68cca3d1 Merge pull request #2354 from MediaBrowser/beta
Beta
2016-12-18 01:19:29 -05:00
Luke
b66d076def Merge pull request #2353 from MediaBrowser/dev
Dev
2016-12-18 01:19:16 -05:00
Luke
e78bbbd6f1 Merge pull request #2352 from MediaBrowser/master
merge from master
2016-12-18 00:47:58 -05:00
Luke
de06847f41 Merge pull request #2351 from MediaBrowser/master
merge from master
2016-12-18 00:47:30 -05:00
Luke Pulverenti
d7ad1331f1 fix merge conflict 2016-12-18 00:47:12 -05:00
Luke
e7cebb91a7 Merge pull request #2350 from MediaBrowser/beta
Beta
2016-12-18 00:44:33 -05:00
Luke Pulverenti
025905a3e4 fix merge conflict 2016-12-18 00:44:21 -05:00
Luke Pulverenti
54d5b71577 restore version 2016-12-18 00:43:53 -05:00
Luke Pulverenti
4853e795d7 fix merge conflict 2016-12-18 00:43:37 -05:00
Luke Pulverenti
bc58e2862c fix merge conflicts 2016-12-18 00:43:11 -05:00
Luke Pulverenti
e7e0a1ecfc fix merge conflict 2016-12-18 00:42:21 -05:00
Luke Pulverenti
ae1110219d fix merge conflicts 2016-12-18 00:35:28 -05:00
Luke
aaa027f322 Merge pull request #2349 from MediaBrowser/dev
Dev
2016-12-18 00:26:20 -05:00
Luke Pulverenti
38b26acd87 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-12-18 00:25:13 -05:00
Luke Pulverenti
fb8e3f0843 speed up timer query by id 2016-12-18 00:25:06 -05:00
Luke
d63e4f5573 update mac project 2016-12-18 00:11:30 -05:00
Luke Pulverenti
f4b3ad24e0 3.1.259 2016-12-18 00:09:12 -05:00
Luke
0a7b5861b6 Merge pull request #2348 from MediaBrowser/dev
Dev
2016-12-18 00:08:53 -05:00
Luke Pulverenti
bc6d28222a Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-12-17 23:58:35 -05:00
Luke Pulverenti
2d09c187cc redesign series timer edit screen 2016-12-17 23:58:20 -05:00
Luke
a25fb37c80 update mac project 2016-12-17 21:48:00 -05:00
Luke Pulverenti
3c586ac7e0 3.1.258 2016-12-17 21:37:25 -05:00
Luke
03acdc7cc9 Merge pull request #2347 from MediaBrowser/dev
Dev
2016-12-17 21:35:57 -05:00
Luke Pulverenti
c99fa9a651 update timer images 2016-12-17 21:35:21 -05:00
Luke Pulverenti
2481c5d9f8 fix boxset socket events 2016-12-17 15:52:05 -05:00
Luke Pulverenti
5666049e57 3.1.257 2016-12-17 03:59:04 -05:00
Luke
799fbd6f32 Merge pull request #2346 from MediaBrowser/dev
Dev
2016-12-17 03:30:26 -05:00
Luke Pulverenti
cc73830cd6 fix music album image inheritance 2016-12-17 03:27:41 -05:00
Luke
12f46d961b Merge pull request #2345 from MediaBrowser/dev
Dev
2016-12-17 01:49:02 -05:00
Luke Pulverenti
ef490818d7 update dlna default user 2016-12-16 00:24:33 -05:00
Luke Pulverenti
7c6ebe9b21 update components 2016-12-15 23:05:22 -05:00
Luke Pulverenti
0091d2c51e update components 2016-12-15 23:02:52 -05:00
Luke Pulverenti
973749bb99 update components 2016-12-15 22:15:34 -05:00
Luke Pulverenti
7a67cb5498 3.1.256 2016-12-15 15:35:24 -05:00
Luke
8404c30997 Merge pull request #2344 from MediaBrowser/dev
fix userviews for androidtv
2016-12-15 15:26:02 -05:00
Luke Pulverenti
7e761df3cb fix userviews for androidtv 2016-12-15 15:23:10 -05:00
Luke
b0b65b17a4 Merge pull request #2343 from MediaBrowser/dev
Dev
2016-12-15 15:07:15 -05:00
Luke Pulverenti
988c898fc1 support timeshifting with safari mac and edge mobile 2016-12-15 15:03:57 -05:00
Luke Pulverenti
7708d96b8b improve Play To device detection 2016-12-15 02:12:52 -05:00
Luke Pulverenti
3674a65fae stop guide refresh when needed 2016-12-15 01:41:10 -05:00
Luke Pulverenti
612e85fe91 3.1.255 2016-12-14 16:02:03 -05:00
Luke
4cc15a8919 Merge pull request #2342 from MediaBrowser/dev
Dev
2016-12-14 16:01:33 -05:00
Luke Pulverenti
de9cd28a79 remove tvos dts hack no longer needed 2016-12-14 15:58:55 -05:00
Luke Pulverenti
524e7facc8 fix socket errors on linux under .net core 2016-12-13 18:38:26 -05:00
Luke
96e6b519b9 Merge pull request #2341 from MediaBrowser/dev
add missing files
2016-12-13 13:42:05 -05:00
Luke Pulverenti
dcd06597a7 add missing files 2016-12-13 13:41:36 -05:00
Luke Pulverenti
7faf8ca1ec 3.1.254 2016-12-13 13:28:22 -05:00
Luke
6cdbb25b9d Merge pull request #2340 from MediaBrowser/dev
Dev
2016-12-13 13:27:53 -05:00
Luke Pulverenti
ffad9c27e4 automatically adjust timer schedules to program changes 2016-12-13 13:23:03 -05:00
Luke Pulverenti
afabbfa22b add ios dts workaround 2016-12-13 12:04:37 -05:00