LukePulverenti 84507736a0 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser ...

Conflicts:
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll

2013-02-22 19:26:38 -05:00

..

Drawing

Removed System.Windows.Forms dependancy from Common. Almost done removing NLog dependancy.

2013-02-21 20:26:35 -05:00

Entities

isolated clickonce dependancies

2013-02-21 23:23:06 -05:00

Extensions

fixed x64

2013-02-21 12:22:41 -05:00

IO

isolated clickonce dependancies

2013-02-21 23:23:06 -05:00

Library

isolated clickonce dependancies

2013-02-21 23:23:06 -05:00

Localization

Removed System.Windows.Forms dependancy from Common. Almost done removing NLog dependancy.

2013-02-21 20:26:35 -05:00

MediaInfo

more dependancy injection

2013-02-21 16:40:04 -05:00

Persistence

isolated sqlite dependancy

2013-02-20 23:37:50 -05:00

Playback

removed server reference from ui solution

2013-02-21 01:52:27 -05:00

Plugins

moved Plugins to separate repo

2013-02-22 01:28:57 -05:00

Properties

added a master version file

2013-02-22 02:17:50 -05:00

Providers

Removed System.Windows.Forms dependancy from Common. Almost done removing NLog dependancy.

2013-02-21 20:26:35 -05:00

Resolvers

added simple injector for dependancy management

2013-02-22 19:24:50 -05:00

ScheduledTasks

created IWebSocketListener

2013-02-22 10:16:48 -05:00

Sorting

isolated bdinfo dependancy

2013-02-21 01:38:23 -05:00

Updates

more dependancy injection

2013-02-21 16:40:04 -05:00

Weather

isolated weather and moved drawing classes up to the controller project

2013-02-21 01:02:10 -05:00

Kernel.cs

added simple injector for dependancy management

2013-02-22 19:24:50 -05:00

MediaBrowser.Controller.csproj

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2013-02-22 19:26:38 -05:00

packages.config

added simple injector for dependancy management

2013-02-22 19:24:50 -05:00

ServerApplicationPaths.cs

Pushing missing changes

2013-02-20 20:33:05 -05:00