Commit Graph

6488 Commits

Author SHA1 Message Date
Luke
baf0b7a7ce Merge pull request #1367 from MediaBrowser/beta
Beta
2015-12-27 16:46:55 -05:00
Luke Pulverenti
b66d279cf5 fix merge conflict 2015-12-27 16:46:43 -05:00
Luke Pulverenti
5196a97ebd fix merge conflict 2015-12-27 16:45:57 -05:00
Luke Pulverenti
25ff78a8a3 fix merge conflict 2015-12-27 16:44:50 -05:00
Luke Pulverenti
dd0888d680 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-12-27 16:43:38 -05:00
Luke Pulverenti
88153d3875 fix merge conflict 2015-12-27 16:43:31 -05:00
Luke Pulverenti
b3f8e538c4 3.0.5800.0 2015-12-27 16:42:46 -05:00
Luke
9a0c7333ff Merge pull request #1366 from MediaBrowser/master
3.0.5782.0
2015-12-27 16:42:04 -05:00
Luke Pulverenti
03118de6b7 fix merge conflict 2015-12-27 16:41:54 -05:00
Luke
1e4ecf4798 Merge pull request #1365 from MediaBrowser/master
3.0.5782.0
2015-12-27 16:41:03 -05:00
Luke Pulverenti
8eddcc2346 3.0.5782.0 2015-12-27 16:40:36 -05:00
Luke Pulverenti
6eb5d34af1 update subtitle encoder to allow format passthrough 2015-12-27 16:07:28 -05:00
Luke
47f3571aea fixes #1145 - Improve support for daily episodes 2015-12-27 14:40:21 -05:00
Luke Pulverenti
1e470a15d6 restore changes 2015-12-27 14:32:01 -05:00
Luke
78e6d1b80f Merge pull request #1363 from MediaBrowser/beta
merge from beta
2015-12-27 14:28:14 -05:00
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