Commit Graph

7219 Commits

Author SHA1 Message Date
Luke Pulverenti
1e4ee3f60e 3.0.5840 2016-01-20 15:25:46 -05:00
Luke
dc6595c77f Merge pull request #1417 from MediaBrowser/master
Merge pull request #1416 from MediaBrowser/beta
2016-01-20 15:22:45 -05:00
Luke
e272c40a52 Merge pull request #1416 from MediaBrowser/beta
Beta
2016-01-20 15:22:30 -05:00
Luke Pulverenti
f3ea2dbf5c Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-01-20 15:20:08 -05:00
Luke
e85a8bb801 Merge pull request #1415 from MediaBrowser/master
Merge pull request #1414 from MediaBrowser/beta
2016-01-20 14:57:05 -05:00
Luke
37b936642a Merge pull request #1414 from MediaBrowser/beta
Merge pull request #1413 from MediaBrowser/master
2016-01-20 14:56:52 -05:00
Luke Pulverenti
bf38997dc6 resolve config caching issue 2016-01-20 14:54:41 -05:00
Luke Pulverenti
2f1996b773 resolve config caching issue 2016-01-20 14:54:06 -05:00
Luke
29f99db776 Merge pull request #1413 from MediaBrowser/master
merge from master
2016-01-20 13:41:35 -05:00
Luke
f58503b28c Merge pull request #1412 from MediaBrowser/beta
merge from beta
2016-01-20 13:40:51 -05:00
Luke Pulverenti
17680d59b6 3.0.5816 2016-01-20 13:38:09 -05:00
Luke Pulverenti
7f7d80bf64 trim logging 2016-01-20 13:37:07 -05:00
Luke Pulverenti
35e48e4990 trim logging 2016-01-20 13:11:02 -05:00
Luke Pulverenti
172e4d8466 refresh series timers on changes 2016-01-19 22:48:37 -05:00
Luke Pulverenti
d9c678afaf 3.0.5815 2016-01-19 22:05:56 -05:00
Luke Pulverenti
1055c1c77e normalize remote ip 2016-01-19 22:04:08 -05:00
Luke Pulverenti
b959b7d447 add back api keys 2016-01-19 22:03:57 -05:00
Luke Pulverenti
2e78362db2 normalize remote ip 2016-01-19 22:02:26 -05:00
Luke Pulverenti
f26693c9a3 add back api keys 2016-01-19 22:02:14 -05:00
Luke
236b5caee2 Merge pull request #1409 from MediaBrowser/beta
merge from beta
2016-01-19 14:54:07 -05:00
Luke Pulverenti
e951dd20d9 fix merge conflict 2016-01-19 14:52:08 -05:00
Luke Pulverenti
76bfde2675 fix merge conflicts 2016-01-19 14:46:59 -05:00
Luke Pulverenti
a5d54256ff fix merge conflict 2016-01-19 14:45:54 -05:00
Luke Pulverenti
a3fb7347b9 fix merge conflict 2016-01-19 14:44:31 -05:00
Luke Pulverenti
b23f976511 add delete to multi-select 2016-01-19 14:10:16 -05:00
Luke Pulverenti
14fe4ab95c add null check in fanart provider 2016-01-19 14:09:56 -05:00
Luke Pulverenti
a2a620a4c4 add delete to multi-select 2016-01-19 14:03:46 -05:00
Luke
29e03046ed Merge pull request #1406 from svenstaro/capitalize-api
Capitalize API
2016-01-19 13:17:21 -05:00
Luke Pulverenti
a04f4421bd add null check in fanart provider 2016-01-19 11:09:33 -05:00
Luke Pulverenti
c4c4237200 3.0.5814 2016-01-19 11:00:28 -05:00
Luke Pulverenti
8087515e72 update translations 2016-01-19 10:59:57 -05:00
Luke Pulverenti
d2dfb4b0a0 update translations 2016-01-19 10:48:36 -05:00
Sven-Hendrik Haase
bd96e3bb61 Capitalize API 2016-01-19 03:44:27 +01:00
Luke Pulverenti
284cb50c66 3.0.5813 2016-01-18 14:10:12 -05:00
Luke
4e567d04f9 auto-organize by date
Conflicts:
	MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
2016-01-18 14:07:55 -05:00
Luke
0ffac65444 update schedules direct to automatically reacquire token 2016-01-18 14:00:15 -05:00
Luke
821b6894e5 update CanSelfUpdate 2016-01-18 13:59:36 -05:00
Luke
e173a9ec7f update library monitor 2016-01-18 13:59:26 -05:00
Luke
0d3c8b8711 auto-organize by date 2016-01-18 00:30:50 -05:00
Luke
c5c23f932b update schedules direct to automatically reacquire token 2016-01-17 23:47:55 -05:00
Luke
efdd1b1f2e update CanSelfUpdate 2016-01-17 21:03:48 -05:00
Luke
db81d2ca1a update library monitor 2016-01-17 21:03:34 -05:00
Luke Pulverenti
cfdb59850c 3.0.5812 2016-01-17 01:42:02 -05:00
Luke Pulverenti
9991f4a69c update commonio 2016-01-16 23:26:08 -05:00
Luke Pulverenti
7987e2092a update episode refresh 2016-01-16 23:25:34 -05:00
Luke Pulverenti
0e1b6d2e79 update image saver 2016-01-16 23:25:19 -05:00
Luke Pulverenti
0cd008bcb9 update commonio 2016-01-16 22:24:24 -05:00
Luke Pulverenti
94261b7669 update episode refresh 2016-01-16 22:24:12 -05:00
Luke Pulverenti
268b1c7916 update image saver 2016-01-16 22:23:59 -05:00
Luke Pulverenti
8bcc7f1b3b 3.0.5811 2016-01-16 14:25:11 -05:00