Mark McDowall a7eb331d4e Merge branch 'ui-notifications' into develop ...

Conflicts:
	NzbDrone.Common/NzbDrone.Common.csproj
	UI/Series/Details/SeasonLayout.js

2013-09-03 07:18:04 -07:00

..

HttpApiProvider.cs

Fixed XBMC notification image

2013-08-12 20:13:05 -07:00

IApiProvider.cs

Removed unused using statements

2013-07-18 20:47:55 -07:00

InvalidXbmcVersionException.cs

Removed unused using statements

2013-07-18 20:47:55 -07:00

JsonApiProvider.cs

Fixed XBMC notification image

2013-08-12 20:13:05 -07:00

TestXbmcCommand.cs

Commands return immediately and signalr is used to control the UI

2013-09-01 21:12:41 -07:00

Xbmc.cs

moved logic for reading static file to mappers

2013-08-19 23:23:36 -07:00

XbmcService.cs

moved logging config to in-process

2013-09-02 22:15:08 -07:00

XbmcSettings.cs

Using warning instead of danger for form elements

2013-08-25 22:34:01 -07:00