Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: funnelweblog/FunnelWeb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mjonas87/FunnelWeb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 8 commits
  • 28 files changed
  • 2 contributors

Commits on Aug 30, 2013

  1. Commented out code button from comment

    Matt Jonas committed Aug 30, 2013
    Copy the full SHA
    f8debf9 View commit details

Commits on Sep 4, 2013

  1. Updated config to use sql instead of sqlce

    Matt Jonas committed Sep 4, 2013
    Copy the full SHA
    e3aeba2 View commit details
  2. Added gitignore

    Matt Jonas committed Sep 4, 2013
    Copy the full SHA
    0796bb5 View commit details
  3. test

    Matt Jonas committed Sep 4, 2013
    Copy the full SHA
    2a3e8ac View commit details
  4. Delete My.config

    mjonas87 committed Sep 4, 2013
    Copy the full SHA
    3093286 View commit details

Commits on Nov 13, 2013

  1. changes

    Matt Jonas committed Nov 13, 2013
    Copy the full SHA
    e5ea514 View commit details
  2. Changes

    Matt Jonas committed Nov 13, 2013
    Copy the full SHA
    84bc703 View commit details
  3. Copy the full SHA
    f8662b7 View commit details
Showing with 7,640 additions and 622 deletions.
  1. +4 −1 .gitignore
  2. +1 −1 src/FunnelWeb.Tests/LifetimeJustifications.cs
  3. +0 −18 src/FunnelWeb.Wcf/AutofacConfigurableServiceHostFactory.cs
  4. +0 −57 src/FunnelWeb.Wcf/FunnelWeb.Wcf.csproj
  5. +0 −36 src/FunnelWeb.Wcf/Properties/AssemblyInfo.cs
  6. +1 −0 src/FunnelWeb.Web/.gitignore
  7. +15 −15 src/FunnelWeb.Web/App_Start/BundleConfig.cs
  8. +1 −1 src/FunnelWeb.Web/App_Start/RouteConfig.cs
  9. +0 −24 src/FunnelWeb.Web/Areas/Admin/Controllers/InstallController.cs
  10. +3 −3 src/FunnelWeb.Web/Areas/Admin/Controllers/LoginController.cs
  11. +52 −167 src/FunnelWeb.Web/Areas/Admin/Views/Install/Index.cshtml
  12. +5 −0 src/FunnelWeb.Web/FunnelWeb.Web.csproj
  13. +0 −8 src/FunnelWeb.Web/My.config
  14. +11 −11 src/FunnelWeb.Web/Scripts/wmd.js
  15. +7,440 −0 src/FunnelWeb.Web/Themes/Flatly/Content/Styles/Theme.css
  16. +0 −30 src/FunnelWeb.Web/Web.Debug.config
  17. +0 −31 src/FunnelWeb.Web/Web.Release.config
  18. +8 −0 src/FunnelWeb.Web/Web.config
  19. +13 −8 src/FunnelWeb/Authentication/Internal/FormsAuthenticator.cs
  20. +17 −13 src/FunnelWeb/Authentication/Internal/FormsFunnelWebMembership.cs
  21. +1 −1 src/FunnelWeb/DatabaseDeployer/IConnectionStringSettings.cs
  22. +2 −3 src/FunnelWeb/FunnelWeb.csproj
  23. +32 −0 src/FunnelWeb/Settings/ConfigurationManager.cs
  24. +18 −27 src/FunnelWeb/Settings/ConnectionStringSettings.cs
  25. +0 −34 src/FunnelWeb/Settings/IConfigSettings.cs
  26. +14 −0 src/FunnelWeb/Settings/IConfigurationManager.cs
  27. +2 −4 src/FunnelWeb/Settings/SettingsModule.cs
  28. +0 −129 src/FunnelWeb/Settings/XmlConfigSettings.cs
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -111,4 +111,7 @@ build/Published/*
Views\Extensions\*

Thumbs.db
src/FunnelWeb.Web/files/
src/FunnelWeb.Web/files/
src/FunnelWeb.Web/Web.Debug.config
src/FunnelWeb.Web/Web.Release.config
src/FunnelWeb.Web/Properties/PublishProfiles/
2 changes: 1 addition & 1 deletion src/FunnelWeb.Tests/LifetimeJustifications.cs
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ public void ComponentsThatShouldBeSingletons()
// The following are singletons just because there's no need to have more than one - if you have a good
// reason feel free to change
IsSingleton<IConnectionStringSettings>("This component uses the bootstrap settings to store the connection string. Since the bootstrap settings are opened/closed on the fly, there only needs to be one instance of this type.");
IsSingleton<IConfigSettings>("This component opens/closes the XML file on the fly; there's no need to have more than one.");
IsSingleton<IConfigurationManager>("This component handles the configuration values");
IsSingleton<IMimeTypeLookup>("It just calls the registry/a static list - no need for more than one");

IsSingleton<IProviderInfo<IDatabaseProvider>>("This type extends the contains, no need to create multiple times");
18 changes: 0 additions & 18 deletions src/FunnelWeb.Wcf/AutofacConfigurableServiceHostFactory.cs

This file was deleted.

57 changes: 0 additions & 57 deletions src/FunnelWeb.Wcf/FunnelWeb.Wcf.csproj

This file was deleted.

36 changes: 0 additions & 36 deletions src/FunnelWeb.Wcf/Properties/AssemblyInfo.cs

This file was deleted.

1 change: 1 addition & 0 deletions src/FunnelWeb.Web/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
My.config
30 changes: 15 additions & 15 deletions src/FunnelWeb.Web/App_Start/BundleConfig.cs
Original file line number Diff line number Diff line change
@@ -26,22 +26,22 @@ public static void RegisterBundles(BundleCollection bundles)
bundles.Add(new ScriptBundle("~/bundles/site").Include("~/Scripts/site.js"));
bundles.Add(new ScriptBundle("~/bundles/wmd").Include("~/Scripts/wmd.js"));

bundles.Add(new StyleBundle("~/Content/themes/base/baseCss").Include("~/Content/themes/base/Base.css"));
bundles.Add(new StyleBundle("~/Content/themes/base/adminCss").Include("~/Content/themes/base/Base.css", "~/Content/themes/base/Admin.css"));
//bundles.Add(new StyleBundle("~/Content/themes/base/baseCss").Include("~/Content/themes/base/Base.css"));
//bundles.Add(new StyleBundle("~/Content/themes/base/adminCss").Include("~/Content/themes/base/Base.css", "~/Content/themes/base/Admin.css"));

bundles.Add(new StyleBundle("~/Content/themes/base/css").Include(
"~/Content/themes/base/jquery.ui.core.css",
"~/Content/themes/base/jquery.ui.resizable.css",
"~/Content/themes/base/jquery.ui.selectable.css",
"~/Content/themes/base/jquery.ui.accordion.css",
"~/Content/themes/base/jquery.ui.autocomplete.css",
"~/Content/themes/base/jquery.ui.button.css",
"~/Content/themes/base/jquery.ui.dialog.css",
"~/Content/themes/base/jquery.ui.slider.css",
"~/Content/themes/base/jquery.ui.tabs.css",
"~/Content/themes/base/jquery.ui.datepicker.css",
"~/Content/themes/base/jquery.ui.progressbar.css",
"~/Content/themes/base/jquery.ui.theme.css"));
//bundles.Add(new StyleBundle("~/Content/themes/base/css").Include(
// "~/Content/themes/base/jquery.ui.core.css",
// "~/Content/themes/base/jquery.ui.resizable.css",
// "~/Content/themes/base/jquery.ui.selectable.css",
// "~/Content/themes/base/jquery.ui.accordion.css",
// "~/Content/themes/base/jquery.ui.autocomplete.css",
// "~/Content/themes/base/jquery.ui.button.css",
// "~/Content/themes/base/jquery.ui.dialog.css",
// "~/Content/themes/base/jquery.ui.slider.css",
// "~/Content/themes/base/jquery.ui.tabs.css",
// "~/Content/themes/base/jquery.ui.datepicker.css",
// "~/Content/themes/base/jquery.ui.progressbar.css",
// "~/Content/themes/base/jquery.ui.theme.css"));

ViewBundleRegistrar.RegisterViewBundles(bundles);
}
2 changes: 1 addition & 1 deletion src/FunnelWeb.Web/App_Start/RouteConfig.cs
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ public static void RegisterRoutes(RouteCollection routes)
routes.MapLowerCaseRoute("get/{*path}", new { controller = "Upload", action = "Render", area = "Admin" });

// Resources
routes.MapLowerCaseRoute("content/theme.css", new { controller = "Resource", action = "RenderThemedFileIfExists", fileToRender = "{Theme}/Content/Styles/Theme.css", contentType = "text/css" });
//routes.MapLowerCaseRoute("content/theme.css", new { controller = "Resource", action = "RenderThemedFileIfExists", fileToRender = "{Theme}/Content/Styles/Theme.css", contentType = "text/css" });
routes.MapLowerCaseRoute("robots", new { controller = "Resource", action = "Render", fileName = "Content/Resources/Robots.txt", contentType = "text/plain" });
routes.MapLowerCaseRoute("robots.txt", new { controller = "Resource", action = "Render", fileName = "Content/Resources/Robots.txt", contentType = "text/plain" });
routes.MapLowerCaseRoute("humans.txt", new { controller = "Resource", action = "Render", fileName = "Content/Resources/Humans.txt", contentType = "text/plain" });
24 changes: 0 additions & 24 deletions src/FunnelWeb.Web/Areas/Admin/Controllers/InstallController.cs
Original file line number Diff line number Diff line change
@@ -68,30 +68,6 @@ public virtual ActionResult Index()
return View("Index", model);
}

public ActionResult ChangeProvider(string databaseProvider)
{
var provider = databaseProvidersInfo().GetProviderByName(databaseProvider);

ConnectionStringSettings.ConnectionString = provider.DefaultConnectionString;
ConnectionStringSettings.DatabaseProvider = databaseProvider;
if (!provider.SupportSchema)
ConnectionStringSettings.Schema = null;
UpgradeDetector.Reset();

return RedirectToAction("Index");
}

[HttpPost]
[ActionName("test")]
public virtual ActionResult Test(string connectionString, string schema)
{
ConnectionStringSettings.ConnectionString = connectionString;
ConnectionStringSettings.Schema = schema;
UpgradeDetector.Reset();

return RedirectToAction("Index");
}

[HttpPost]
public virtual ActionResult Upgrade()
{
6 changes: 3 additions & 3 deletions src/FunnelWeb.Web/Areas/Admin/Controllers/LoginController.cs
Original file line number Diff line number Diff line change
@@ -9,9 +9,9 @@ namespace FunnelWeb.Web.Areas.Admin.Controllers
[ValidateInput(false)]
public class LoginController : Controller
{
readonly Lazy<IConfigSettings> bootstrapSettings;
readonly Lazy<IConfigurationManager> bootstrapSettings;

public LoginController(Lazy<IConfigSettings> bootstrapSettings)
public LoginController(Lazy<IConfigurationManager> bootstrapSettings)
{
this.bootstrapSettings = bootstrapSettings;
}
@@ -25,7 +25,7 @@ public virtual ActionResult Login(LoginModel model)

if (model.DatabaseIssue == true)
{
model.ConfigFileMissing = bootstrapSettings.Value.ConfigFileMissing();
model.ConfigFileMissing = string.IsNullOrEmpty(bootstrapSettings.Value.ConnectionString);
}

return View(model);
Loading