Sebastiaan Janssen fe254ea99f Merge branch 'master' into move-masterpages-to-views ...

# Conflicts:
#	.gitignore
#	OurUmbraco.Site/OurUmbraco.Site.csproj
#	OurUmbraco.Site/Views/MacroPartials/Members/ForgotPassword.cshtml
#	OurUmbraco.Site/Views/Partials/Members/ForgotPassword.cshtml
#	OurUmbraco.Site/Views/Partials/Members/Login.cshtml
#	OurUmbraco.Site/Views/Search/Search.aspx.cs
#	OurUmbraco.Site/config/imageprocessor/cache.config
#	OurUmbraco.Site/masterpages/Community.master
#	OurUmbraco.Site/masterpages/ReleaseProgress.master
#	OurUmbraco.Site/masterpages/Repository/Projects.master
#	OurUmbraco.Site/masterpages/popular.master
#	OurUmbraco/Our/Controllers/LoginController.cs
#	OurUmbraco/Our/MigrationsHandler.cs
#	OurUmbraco/Our/usercontrols/FileDownloadProxy.ascx.cs
#	OurUmbraco/OurUmbraco.csproj
#	OurUmbraco/packages.config

2017-01-21 20:29:29 +01:00

..

App_Browsers

Initial commit

2012-12-17 09:41:11 +01:00

App_Data

re-installs umbraco, now has proper nuget version targets, removes old access files, adds health check dashboard to the config.

2016-08-09 10:21:16 +02:00

App_Plugins

Merge branch 'refs/heads/master' into move-masterpages-to-views

2016-11-07 08:45:46 +01:00

Assets

More merge fixing

2017-01-21 19:52:20 +01:00

config

Merge branch 'master' into move-masterpages-to-views

2017-01-21 18:47:09 +01:00

css

Re-populate location after submit with errors

2016-09-01 18:43:18 +02:00

images

Merge with master and upgrade to 7.2.0

2014-12-06 14:53:53 +01:00

macroScripts

Merge branch 'master' into move-masterpages-to-views

2017-01-21 18:47:09 +01:00

media/avatar

Missing avatar file

2015-01-26 14:34:36 +01:00

projects/umbraco-pro/contour/Documentation

OUR-243 Contour documentation gives page not found

2015-06-25 21:15:00 +02:00

Properties

And removes final files that would break the publish

2016-02-05 13:04:47 +01:00

scripts

Re-populate location after submit with errors

2016-09-01 18:43:18 +02:00

Service References/Application Insights

Merge branch 'master' into move-masterpages-to-views

2017-01-21 18:47:09 +01:00

umbraco

Upgrade to 7.5.7

2017-01-21 17:30:32 +01:00

umbraco_client

Upgrade to Umbraco 7.5.5

2016-12-07 11:43:50 +01:00

Views

Fix merge errors

2017-01-21 19:16:11 +01:00

w3c

Initial commit

2012-12-17 09:41:11 +01:00

webservices

Initial commit

2012-12-17 09:41:11 +01:00

xslt

Some more error fixing after noticing them in the logs

2015-08-02 12:07:41 +02:00

ApplicationInsights.config

Merge branch 'master' into move-masterpages-to-views

2017-01-21 18:47:09 +01:00

default.aspx

Initial commit

2012-12-17 09:41:11 +01:00

Global.asax

Upgrade to 7.5.4

2016-10-22 11:56:47 +02:00

google98fb13fcf3cf0ae7.html

Sync new web.config keys and adds google verification file

2016-02-05 14:05:27 +01:00

Hiccup.aspx

Adjust uForum namespaces to be correct

2015-07-26 20:31:59 +02:00

HTMLPage.html

Initial commit

2012-12-17 09:41:11 +01:00

OurUmbraco.Site.csproj

Merge branch 'master' into move-masterpages-to-views

2017-01-21 20:29:29 +01:00

packages.config

Update Examine and Image Processor

2017-01-21 14:46:40 +01:00

robots.txt

Disallow crawlers for CI server

2015-01-18 11:35:15 +01:00

setpermssions.bat

Initial commit

2012-12-17 09:41:11 +01:00

thank-you.png

Initial commit

2012-12-17 09:41:11 +01:00

web.Debug.config

Attempt to improve build process

2015-06-25 11:22:44 +02:00

web.Release.config

Don't remove the debug attribute for release

2016-09-04 14:51:38 +02:00

web.template.config

Merge branch 'master' into move-masterpages-to-views

2017-01-21 18:47:09 +01:00