Luke
|
667fe4f509
|
Merge pull request #1379 from MediaBrowser/beta
merge from beta
|
9 years ago |
|
Luke Pulverenti
|
7dca92f8a0
|
fix merge conflicts
|
9 years ago |
|
Luke Pulverenti
|
eab4fc6480
|
3.0.5800.1
|
9 years ago |
|
Luke Pulverenti
|
8998f906c6
|
update local address detection
Conflicts:
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
|
9 years ago |
|
Luke Pulverenti
|
b46ef16ba8
|
update local address detection
|
9 years ago |
|
Luke Pulverenti
|
971808f38f
|
restore change
|
9 years ago |
|
Luke Pulverenti
|
bbc96a5277
|
Merge branch 'beta' into dev
|
9 years ago |
|
Luke Pulverenti
|
5d4682d418
|
Merge branch 'dev' into beta
|
9 years ago |
softworkz
|
2ed5c3d0e7
|
Fixed missing episode and season numbers when searching for episodes by date
|
9 years ago |
|
Luke
|
50a16452a9
|
Merge pull request #1377 from softworkz/SearchEpisodeByAirDate
Fixed missing episode and season numbers when searching for episodes by date
|
9 years ago |
|
softworkz
|
9063827bab
|
Fixed missing episode and season numbers when searching for episodes by date
|
9 years ago |
|
Luke Pulverenti
|
309710c1aa
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
ef644ca8a9
|
update SocketHttpListener
|
9 years ago |
|
Luke Pulverenti
|
06467da312
|
update SocketHttpListener
|
9 years ago |
|
Luke
|
cdea2e0e74
|
update mac project
|
9 years ago |
|
Luke
|
6b9e7d0f12
|
Merge pull request #1375 from MediaBrowser/master
update email
|
9 years ago |
|
Luke
|
d3a8ab8926
|
Merge pull request #1374 from MediaBrowser/master
update email
|
9 years ago |
|
Luke
|
0b3ec059c3
|
Merge pull request #1373 from MediaBrowser/master
add tuner error handling
|
9 years ago |
|
Luke
|
a7c7446bd0
|
Merge pull request #1372 from MediaBrowser/master
add tuner error handling
|
9 years ago |
|
Luke Pulverenti
|
de1495763f
|
add tuner error handling
|
9 years ago |
|
Luke
|
f31efcb62d
|
fixes #1124 - Download Missing Images does not work when Item is locked
|
9 years ago |
|
Luke
|
16a77047d3
|
Merge pull request #1371 from MediaBrowser/master
throttle tmdb requests
|
9 years ago |
|
Luke
|
3231c07ae1
|
Merge pull request #1370 from MediaBrowser/master
throttle tmdb requests
|
9 years ago |
|
Luke Pulverenti
|
2743b79f02
|
throttle tmdb requests
|
9 years ago |
|
Luke
|
5ab6f9b503
|
Merge pull request #1369 from MediaBrowser/beta
update SocketHttpListener
|
9 years ago |
|
Luke Pulverenti
|
c4c78f029f
|
update SocketHttpListener
|
9 years ago |
|
Luke
|
e4c58d3abd
|
Merge pull request #1368 from MediaBrowser/beta
update SocketHttpListener
|
9 years ago |
|
Luke Pulverenti
|
192ef5d639
|
update SocketHttpListener
|
9 years ago |
|
Luke Pulverenti
|
9750739a86
|
version bump
|
9 years ago |
|
Luke
|
baf0b7a7ce
|
Merge pull request #1367 from MediaBrowser/beta
Beta
|
9 years ago |
|
Luke Pulverenti
|
b66d279cf5
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
5196a97ebd
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
25ff78a8a3
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
dd0888d680
|
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
|
9 years ago |
|
Luke Pulverenti
|
88153d3875
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
b3f8e538c4
|
3.0.5800.0
|
9 years ago |
|
Luke
|
9a0c7333ff
|
Merge pull request #1366 from MediaBrowser/master
3.0.5782.0
|
9 years ago |
|
Luke Pulverenti
|
03118de6b7
|
fix merge conflict
|
9 years ago |
|
Luke
|
1e4ecf4798
|
Merge pull request #1365 from MediaBrowser/master
3.0.5782.0
|
9 years ago |
|
Luke Pulverenti
|
8eddcc2346
|
3.0.5782.0
|
9 years ago |
|
Luke Pulverenti
|
6eb5d34af1
|
update subtitle encoder to allow format passthrough
|
9 years ago |
|
Luke
|
47f3571aea
|
fixes #1145 - Improve support for daily episodes
|
9 years ago |
|
Luke Pulverenti
|
1e470a15d6
|
restore changes
|
9 years ago |
|
Luke
|
78e6d1b80f
|
Merge pull request #1363 from MediaBrowser/beta
merge from beta
|
9 years ago |
|
Luke Pulverenti
|
12e7118be4
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
5e445b65f3
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
2b6b76775f
|
update server project
|
9 years ago |
|
Luke Pulverenti
|
4b11e3e0d8
|
fix merge conflicts
|
9 years ago |
|
Luke Pulverenti
|
421aa2dc5f
|
update SocketHttpListener
|
9 years ago |
|
Luke Pulverenti
|
e174a7c1ef
|
add ipv6, update SocketHttpListener
|
9 years ago |
