Luke
|
9782f5665c
|
Merge pull request #2362 from MediaBrowser/beta
Beta
|
2016-12-21 15:24:41 -05:00 |
|
Luke Pulverenti
|
f54ed74837
|
fix merge conflict
|
2016-12-21 15:24:20 -05:00 |
|
Luke
|
ef67172555
|
Merge pull request #2361 from MediaBrowser/dev
resolve holiday theme disrupting playback
|
2016-12-21 15:08:56 -05:00 |
|
Luke Pulverenti
|
c0128a0a11
|
resolve holiday theme disrupting playback
|
2016-12-21 15:08:20 -05:00 |
|
Luke Pulverenti
|
617bbce0e1
|
3.1.260
|
2016-12-20 15:06:36 -05:00 |
|
Luke
|
b4575306b8
|
Merge pull request #2360 from MediaBrowser/dev
Dev
|
2016-12-20 15:00:51 -05:00 |
|
Luke Pulverenti
|
7f7be26771
|
restore version
|
2016-12-20 15:00:04 -05:00 |
|
Luke Pulverenti
|
ac2c45dd6a
|
update dlna genre views
|
2016-12-20 14:59:25 -05:00 |
|
Luke Pulverenti
|
74ec6e5a06
|
update dlna music genres
|
2016-12-20 02:31:30 -05:00 |
|
Luke Pulverenti
|
27c4c30082
|
update media info bitrate
|
2016-12-20 00:23:33 -05:00 |
|
Luke Pulverenti
|
d588ed705f
|
update subtitle burn in params
|
2016-12-20 00:23:22 -05:00 |
|
Luke Pulverenti
|
e9ae479360
|
fix duplicate latest recordings section
|
2016-12-20 00:22:31 -05:00 |
|
Luke Pulverenti
|
40e8d0c75e
|
add additional http server error handling
|
2016-12-20 00:21:52 -05:00 |
|
Luke Pulverenti
|
a93c2682d9
|
update timer settings
|
2016-12-20 00:21:21 -05:00 |
|
Luke
|
70f48f9cea
|
Merge pull request #2356 from MediaBrowser/beta
Beta
|
2016-12-18 02:32:59 -05:00 |
|
Luke
|
c15acd0ebc
|
Merge pull request #2355 from MediaBrowser/dev
add error handling
|
2016-12-18 02:32:50 -05:00 |
|
Luke Pulverenti
|
2345d02b41
|
add error handling
|
2016-12-18 02:32:28 -05:00 |
|
Luke Pulverenti
|
357a3750de
|
3.1.0
|
2016-12-18 01:28:48 -05:00 |
|
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 |
|