yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,391 Commits 4 Branches 7 Tags
893f86d34cbc40539896f65cf50f0ec6fdd237c6
Commit Graph

41 Commits

Author SHA1 Message Date
Shannon
ddd2ab463e Ensures that the starter kit view is not returned if there is one already installed 2014-03-05 12:44:38 +11:00
Shannon
cbced2caed fixes db upgrade step to check for correct previous step 2014-03-05 12:21:49 +11:00
Shannon
ce068a60d5 Removes default instructions from the installer service, passing in empty instructions is ok now and the server will assign defaults if they are empty. 2014-03-05 12:08:35 +11:00
Shannon
7f7f3202d2 fixes issue with checking starter kit steps, fixes issue with installer service code with the method param name being the same as the variable name and fixes the _find lookups to ensure a value is returned from the iteration. 2014-03-05 11:49:07 +11:00
Shannon
0227b800a0 Gets the installer steps working nicely and returning the next step to execute which now displays the current step details correctly and dequeues steps that are not required after the previous one has executed. 2014-03-05 11:34:42 +11:00
Shannon
8e89aa233c Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer 
Conflicts:
	src/Umbraco.Web.UI.Client/src/installer/installer.service.js
	src/Umbraco.Web/Install/Controllers/InstallApiController.cs
 2014-03-05 10:34:27 +11:00
Shannon
24ceb5ce2d Updates to include returning the next step in sequence 2014-03-05 10:32:59 +11:00
perploug
923eb300e5 Updates grunt file to run vs file copy 2014-03-04 19:11:27 +01:00
Shannon
d2aecd12eb Updates more installer logic, getting into the nitty gritty details with upgrades, etc... 2014-03-04 19:20:36 +11:00
Shannon
1e99c466ee Updates some tests and fixes a couple things 2014-03-04 16:40:23 +11:00
Shannon
71a9fb4f68 Updated more installer logic 2014-03-04 16:21:45 +11:00
Shannon
0497771750 fixed merge issues 2014-03-04 11:42:11 +11:00
Shannon
000b2b639f Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer 
Conflicts:
	src/Umbraco.Web/Install/Controllers/InstallApiController.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseInstallStep.cs
	src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
	src/Umbraco.Web/Install/InstallSteps/FilePermissionsStep.cs
	src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
	src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
	src/Umbraco.Web/Install/InstallSteps/UserStep.cs
	src/Umbraco.Web/Install/Models/InstallSetupStep.cs
	src/Umbraco.Web/Install/Models/InstallSetupStepAttribute.cs
 2014-03-04 11:20:52 +11:00
Shannon
885f691c0e Updated install steps, classes and logic 2014-03-04 11:16:42 +11:00
perploug
ce65ae8742 Updates to the installer UI 
Adds database and packages step
 2014-03-03 08:57:57 +01:00
Shannon
3fc96a45a6 Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer 2014-02-27 10:16:45 +01:00
Shannon
3b71a6c3a5 asfsafd 2014-02-27 10:16:30 +01:00
perploug
9c4212703b umbraco base url 2014-02-27 10:00:38 +01:00
Shannon
429b5f7c01 Updates the completion stage of the installer 2014-02-26 16:49:35 +01:00
Shannon
a9916fc415 Installer logic working for a new installer on sqlce 2014-02-26 16:30:25 +01:00
Shannon
f9304d7f04 Gets lots of the new installer logic working 2014-02-26 16:01:31 +01:00
Shannon
f9475305bb more install bits 2014-02-26 18:25:59 +11:00
Shannon
00f2afe454 Creates Install MVC Area, creates new installer api controllers, moves old installer files to the new Area folder so that the /install path can route properly. 2014-02-26 04:15:14 +11:00
Shannon
b8fe5df3c9 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Configuration/GlobalSettings.cs
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web.UI/config/feedProxy.config
	src/Umbraco.Web.UI/config/tinyMceConfig.config
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
	src/Umbraco.Web.UI/config/umbracoSettings.config
	src/Umbraco.Web.UI/config/xsltExtensions.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.Release.xml
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
 2014-02-25 02:24:45 +11:00
Sebastiaan Janssen
ac59c5deb0 Fixing some potential upgrade issues and two issues found with the legacy member API 
- For legacy API we never had and "approved" checkbox, so the assumption is that members are always approved
- The RequiresUniqueEmail check was wrong, previously the assumption was: if there's no e-mail then don't check for uniqueness
 2014-02-22 16:44:02 +01:00
Per Ploug Krogslund
7440855c72 merge 2013-11-07 17:16:22 +01:00
Shannon
046dcdcaf7 Replaces more calls to legacy UmbracoSettings with the new configuration section, fixes loads of null checks when dealing with package repository APIs 2013-09-16 11:22:11 +10:00
Shannon
968c921829 Finished the new installer screen report, finished and tested the v7 db upgrade script which is working!! :) Changed over all package manifests to have an alias instead of a GUID. 2013-09-11 18:25:51 +10:00
Shannon
66c2157bea Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/MediaController.cs
	src/Umbraco.Web/Install/UmbracoInstallAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
 2013-07-31 18:52:14 +10:00
Shannon
6f464567bb Implements real FormsAuthentication for back office cookie authentication... finally :) 2013-07-31 17:08:56 +10:00
Shannon
e2eeafcbfc Fixes: U4-2232 UmbracoAuthorizeAttribute breaks Relfection methods - ensures that no singleton instances are passed into attributes since they only ever get created once, meaning we're left with a stale version in the attribute. 2013-07-31 16:45:11 +10:00
Shannon Deminick
495b4ed9e0 Refactors the WebSecurity class to not be static and be part of the UmbracoContext. Makes a few methods internal on it so that 
it's not relying on the legacy User class. Cleans up the new BasePage and EnsuredUmbracoPage
 2013-04-04 23:30:17 +06:00
Shannon Deminick
9b85bc0e64 Added installer step to choose rendering engine but have left it disabled, might make a dashboard instead for that. 2013-03-07 21:25:11 +06:00
Shannon Deminick
db268c6805 renamed to MemberAuthorizeAttribute and changed it to inherit from a AuthorizeAttribute as this happens much further up the chain than 
the filter attribute and also contains the correct logic to ensure authorization always happens regardless of if the page is cached. Cleaned
up our other authorize attibutes.
 2013-02-26 02:21:51 +06:00
Shannon Deminick
58b3ce749e Fixed Skinning step to point to correct user control 2013-02-04 20:23:57 +06:00
Shannon Deminick
1be3af1e31 Working on #U4-1358 - moving Base page classes to their correct location/assembly. Migrated all installation webforms files and associated helper files to 
their correct locations/namespaces/assemblies and obsoleted all of the old ones and ensure the old webforms files don't exist where the obsoleted ones were.
Fixes a security issue with the installer ajax service (used to be p.aspx, now is InstallerRestService.aspx)
 2013-02-03 05:06:11 +06:00
Shannon Deminick
a7834b45da Created UmbracoAuthorizeAttribute, UmbracoAuthorizedController for all base MVC controllers that required a back office user to be logged in. 
Converted over the SaveTemplate and SavePartialView methods of the codeEditorSave legacy web service to use MVC services and marked them obsolete.
Created a generic route to route all controllers found in the namespace Umbraco.Web.WebServices. Added a 'Url' property on the BasePage webforms class
to expose a UrlHelper for use in views. Created UrlHelper extensions to easily get the base url path of the REST MVC web services.
Converted the EditView page and JavaScript to use the new REST services with jQuery instead of crappy MS ajax.
 2012-12-30 03:11:21 +03:00
Shannon Deminick
eac11c1b80 cleaned up some of the install auth attribute 2012-11-14 21:22:30 +05:00
Shannon Deminick
3fb9ffca5b Update for installer rest service, updates version 2012-11-14 19:50:39 +05:00
Shannon Deminick
3cf9a45724 Finalized initial refactor of package installation for the installer, ensures the app pool is properly restarted 
before installing Business Logic.
 2012-10-17 07:08:35 +05:00
Shannon Deminick
6f778c26d1 Initial commit of refactoring of package installer for the installer process. Converted a few webforms pages/controls to the new format, created 
new JS class to manage the installation, created new MVC controller for managing the ajax installation
 2012-10-16 01:33:35 +05:00