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

Conflicts:
	MediaBrowser.Common.Implementations/BaseApplicationHost.cs
	MediaBrowser.ServerApplication/ApplicationHost.cs

2013-02-27 11:57:14 -05:00

..

Controls

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

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

Implementations

moved some network code to the networking assembly

2013-02-23 12:54:51 -05:00

Logging

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

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

Properties

added a master version file

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

Resources/Images

Pushing missing changes

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

App.config

Pushing missing changes

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

app.manifest

Pushing missing changes

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

App.xaml

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

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

App.xaml.cs

added a shutdown api method, font size fix and other decouplings

2013-02-26 11:10:55 -05:00

ApplicationHost.cs

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

2013-02-27 11:57:14 -05:00

LibraryExplorer.xaml

Pushing missing changes

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

LibraryExplorer.xaml.cs

plugin security fixes and other abstractions

2013-02-25 22:43:04 -05:00

MainWindow.xaml

Pushing missing changes

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

MainWindow.xaml.cs

fixed the plugin catalog not loading

2013-02-27 11:46:48 -05:00

MediaBrowser.ServerApplication_TemporaryKey.pfx

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

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

MediaBrowser.ServerApplication.csproj

a little more consolidation

2013-02-26 16:05:52 -05:00

packages.config

plugin security fixes and other abstractions

2013-02-25 22:43:04 -05:00