Commit Graph

7750 Commits

Author SHA1 Message Date
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
LukePulverenti
a2d215b6ae added simple injector for dependancy management 2013-02-22 19:24:50 -05:00
LukePulverenti
107c241598 Added IDisposable to IWebSocketListener 2013-02-22 15:52:59 -05:00
Chris Schneider
4a46612c3f Merge commit 'fa4e85bd0272746c37c0f132fe15bc440e9e1efe' 2013-02-22 14:36:40 -06:00
Chris Schneider
a707f119c4 mb logo split 2013-02-22 14:36:18 -06:00
Eric Reed
c8bcfe1a54 create zip package in post build 2013-02-22 15:32:52 -05:00
ScottIsAFool
46b48c8982 Created ApiClient nuget package. 2013-02-22 20:12:57 +00:00
Eric Reed
10559f2b7d Conditional post-build 2013-02-22 15:05:38 -05:00
Eric Reed
43854972c8 partial post build on serverapplication 2013-02-22 14:52:56 -05:00
ScottIsAFool
83b7b18614 Set the Common, Controller, Model, UI and UI.Controls to go into one folder, set nuspec files up for the packages to make it easier to create nuget packages. 2013-02-22 19:22:39 +00:00
LukePulverenti
a7f3c307e1 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 14:00:26 -05:00
Chris Schneider
5623abb286 removed deprecated code 2013-02-22 09:46:39 -06:00
Chris Schneider
58cfcd4126 added missing type: attr
type: attributes were accidentally omitted during the merge
2013-02-22 09:28:35 -06:00
LukePulverenti
8b3e8ad478 created IWebSocketListener 2013-02-22 10:16:48 -05:00
Chris Schneider
047e97cb22 make metro styled tiles look and act the same 2013-02-22 09:08:51 -06:00
LukePulverenti
fab627c845 added a master version file 2013-02-22 02:17:50 -05:00
LukePulverenti
746c5d2fa7 moved Plugins to separate repo 2013-02-22 01:28:57 -05:00
LukePulverenti
868a7ce9c8 isolated clickonce dependancies 2013-02-21 23:23:06 -05:00
LukePulverenti
fdafa59683 Removed System.Windows.Forms dependancy from Common. Almost done removing NLog dependancy. 2013-02-21 20:26:35 -05:00
LukePulverenti
931c0ea455 more dependancy injection 2013-02-21 16:40:04 -05:00
Eric Reed
8f41685a96 don't ignore pfx files 2013-02-21 16:30:41 -05:00
Eric Reed
3de4b0fa26 recreate key file for installer project 2013-02-21 16:21:11 -05:00
LukePulverenti
76f067f867 extracted more logging dependancies 2013-02-21 16:06:23 -05:00
LukePulverenti
2a2ee4adb3 logger fixes for the ui 2013-02-21 15:36:36 -05:00
LukePulverenti
211dd6b257 add core plugins 2013-02-21 15:30:29 -05:00
LukePulverenti
ab1065a567 removed static logger 2013-02-21 15:26:55 -05:00
Eric Reed
4019b9260b More installer work
committing so I can move to my laptop for travel
2013-02-21 14:21:28 -05:00
LukePulverenti
0f67adb53d renamed DTO folder to Dto 2013-02-21 12:56:21 -05:00
LukePulverenti
c5fd7c3bd6 removed ISupportsSpecialFeatures 2013-02-21 12:51:26 -05:00
ScottIsAFool
ec621df5f6 Renamed Dto objects
Updated Fody
Renamed Dto objects
2013-02-21 17:50:46 +00:00
Scott Lovegrove
fbf963b68f Updated .gitignore to ignore packages 2013-02-21 17:38:51 +00:00
LukePulverenti
5e08d95b92 fixed x64 2013-02-21 12:22:41 -05:00
Luke
3bac0a516f Update README.md 2013-02-21 10:14:42 -05:00
Luke
4632647ea3 Update README.md 2013-02-21 10:13:12 -05:00
Eric Reed
c5f9ee02f2 Installer minor tweaks 2013-02-21 09:13:26 -05:00
Eric Reed
b934c3ab40 Remove reference to temp key file 2013-02-21 09:12:35 -05:00
LukePulverenti
815240f920 fix query string parsing issue 2013-02-21 02:00:04 -05:00
LukePulverenti
bd2f385e56 removed server reference from ui solution 2013-02-21 01:52:27 -05:00
LukePulverenti
ee9d481662 isolated bdinfo dependancy 2013-02-21 01:38:23 -05:00
LukePulverenti
ae4ffa75be isolated weather and moved drawing classes up to the controller project 2013-02-21 01:02:10 -05:00
LukePulverenti
acf5b0b6ed isolated DotNetZip dependancy 2013-02-21 00:00:56 -05:00
LukePulverenti
a0ced20d5b removed unneeded references 2013-02-20 23:47:32 -05:00
LukePulverenti
a5f9dc1bfc isolated sqlite dependancy 2013-02-20 23:37:50 -05:00
LukePulverenti
509156cbc3 remove core plugin output from source control 2013-02-20 21:40:36 -05:00
LukePulverenti
767cdc1f6f Pushing missing changes 2013-02-20 20:33:05 -05:00
Luke
845554722e Merge pull request #1 from MediaBrowser/Repo
Repo
2013-02-20 17:10:49 -08:00
LukePulverenti
14bbb68047 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser into Repo 2013-02-20 20:04:30 -05:00
luke-pulverenti
2f142263f0 Update README.md 2013-02-15 23:55:32 -05:00
luke-pulverenti
4fef7ca974 Initial commit 2013-02-15 20:40:35 -08:00
ebr11 Eric Reed spam
7ed11c0bba Merge with default 2012-09-20 13:54:37 -04:00