Commit Graph

6673 Commits

Author SHA1 Message Date
Luke Pulverenti
12e7118be4 fix merge conflict 2015-12-27 14:28:00 -05:00
Luke Pulverenti
5e445b65f3 fix merge conflict 2015-12-27 14:25:37 -05:00
Luke Pulverenti
2b6b76775f update server project 2015-12-27 14:23:59 -05:00
Luke Pulverenti
4b11e3e0d8 fix merge conflicts 2015-12-27 14:22:55 -05:00
Luke Pulverenti
421aa2dc5f update SocketHttpListener 2015-12-27 14:17:00 -05:00
Luke Pulverenti
e174a7c1ef add ipv6, update SocketHttpListener 2015-12-27 14:07:16 -05:00
Luke Pulverenti
6a9d71db10 update nlog 2015-12-27 14:06:38 -05:00
Luke Pulverenti
e2976f9a6d update text 2015-12-27 13:48:20 -05:00
Luke Pulverenti
d2d8425f01 update SocketHttpListener 2015-12-27 13:48:09 -05:00
Luke
b5367cecd2 Merge pull request #1362 from MediaBrowser/master
update animation
2015-12-27 13:46:55 -05:00
Luke Pulverenti
408afa1dfe Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-12-27 13:37:16 -05:00
Luke Pulverenti
1851bda625 restore changes 2015-12-27 13:37:06 -05:00
Luke
eacbc9404d Merge pull request #1361 from MediaBrowser/master
merge from master
2015-12-27 13:36:27 -05:00
Luke Pulverenti
d10aef45ea fix merge conflict 2015-12-27 13:36:13 -05:00
Luke Pulverenti
bc396aa021 fix keyframes 2015-12-27 13:33:23 -05:00
Luke Pulverenti
69ce0cd5b5 fix scaling 2015-12-27 12:59:10 -05:00
Luke
5698ccc5ce Merge pull request #1360 from MediaBrowser/master
merge from master
2015-12-27 01:19:23 -05:00
Luke Pulverenti
c4094ca098 merge from dev 2015-12-27 01:18:22 -05:00
Luke
3078aaa060 Merge pull request #1359 from MediaBrowser/master
merge from master
2015-12-27 01:14:03 -05:00
Luke
d283b33dde update icon text 2015-12-27 01:11:29 -05:00
Luke
2fa34a236b fixes #1075 - XSS in "Active Devices" Panel of Admin Dashboard 2015-12-27 01:07:27 -05:00
Luke Pulverenti
94ec8d87b8 update bit depth probe 2015-12-27 01:07:13 -05:00
Luke Pulverenti
d59e4ff357 update bit depth probe 2015-12-27 01:05:37 -05:00
Luke Pulverenti
0cbc9c7900 sync model 2015-12-27 00:47:02 -05:00
Luke Pulverenti
575751dbb0 capture bit depth with ffprobe 2015-12-26 21:43:17 -05:00
Luke Pulverenti
c68a03b3ab capture bit depth with ffprobe 2015-12-26 21:39:11 -05:00
Luke Pulverenti
e470e8b132 update SocketHttpListener 2015-12-26 20:36:53 -05:00
Luke Pulverenti
2c86ddaffa update apiclient 2015-12-26 20:28:54 -05:00
Luke Pulverenti
bb4aabc070 update components 2015-12-26 14:57:29 -05:00
Luke Pulverenti
0dcd698c17 try to account for sloppy subtitle file naming 2015-12-26 13:36:51 -05:00
Luke Pulverenti
7f7c847216 try to account for sloppy subtitle file naming 2015-12-26 13:35:53 -05:00
Luke Pulverenti
fda7c3e9f8 update translations 2015-12-26 12:05:02 -05:00
Luke Pulverenti
c5f5e0175b update subtitles 2015-12-26 12:03:39 -05:00
Luke Pulverenti
c39162a056 update translations 2015-12-26 12:01:23 -05:00
Luke Pulverenti
c2a88b8a9d fixes #1243 - Cannot set local address. If detection is wrong, chromecast fails 2015-12-26 09:30:06 -05:00
Luke Pulverenti
079f2683d5 fixes #1243 - Cannot set local address. If detection is wrong, chromecast fails 2015-12-26 09:29:25 -05:00
Luke Pulverenti
dcae643097 fixes #898 - Google Cast Ready 2015-12-26 09:26:35 -05:00
Luke
fb3c69c612 fixes #1310 - Downscaling 1280x720 to 720x404 2015-12-26 09:25:13 -05:00
Luke Pulverenti
3007a988af update SocketHttpListener 2015-12-26 03:07:52 -05:00
Luke Pulverenti
9e84264148 update subtitles 2015-12-26 03:07:24 -05:00
Luke Pulverenti
a755151782 fixes #898 - Google Cast Ready 2015-12-25 23:08:25 -05:00
Luke Pulverenti
40c46ca649 update dlna interface binding 2015-12-25 22:36:38 -05:00
Luke
0ffc5ebace update ulna interface binding 2015-12-25 22:23:02 -05:00
Luke
07d0384e87 fixes #1347 - Issue with subtitles when resuming using DLNA Play To 2015-12-25 21:56:54 -05:00
Luke
c8536040ba fixes #1290 - upgrade audio formats 2015-12-25 21:30:41 -05:00
Luke
cc315c573c fixes #1349 - Problem with Greek subtitle download 2015-12-25 21:22:16 -05:00
Luke
2e2929c77f fixes #1348 - [Feature Request] Option for single subtitle on DLNA config. 2015-12-25 21:21:24 -05:00
Luke
dff283a321 update icon text 2015-12-25 16:27:10 -05:00
Luke
9c3119808b fixes #1075 - XSS in "Active Devices" Panel of Admin Dashboard 2015-12-25 16:21:18 -05:00
Luke
da5fc95612 fixes #1145 - Improve support for daily episodes 2015-12-25 16:18:27 -05:00