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

9380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
57c9d9ca7b Merge remote-tracking branch 'origin/6.2.0' into 7.1.0-installer 
Conflicts:
	src/Umbraco.Tests/MockTests.cs
	src/Umbraco.Web/UmbracoContext.cs
 2014-03-03 04:17:40 +01:00
Shannon
feb9f40237 updates some ctors on umbraco context and routing context to have lazy overloads which allows us to more easily create/mock the umbraco context. 2014-03-03 04:16:09 +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
db4a547801 Fixes build issues 2014-02-26 16:39:40 +01:00
Shannon
a9916fc415 Installer logic working for a new installer on sqlce 2014-02-26 16:30:25 +01:00
Shannon
64a37209b8 Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer 2014-02-26 16:01:48 +01:00
Shannon
f9304d7f04 Gets lots of the new installer logic working 2014-02-26 16:01:31 +01:00
Per Ploug Krogslund
b86ef0d7ac Adds WIP installer files 2014-02-26 15:51:09 +01:00
Per Ploug Krogslund
de97d8849a Fixes broken unit tests 2014-02-26 15:51:09 +01:00
Per Ploug Krogslund
a3576d8564 Moves app controllers into seperate folder 2014-02-26 15:51:08 +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
3800ffc11c Fixes new membership providers to ensure no sql is run on init. Fixes the installer useLegacyEncoding setup to not attempt to set this when the legacy provider is enabled. 2014-02-26 02:57:05 +11:00
Shannon
2a9b1cb246 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
 2014-02-25 03:30:32 +11:00
Shannon
651182f5de Fixes sql statement - to be like we have in v7 that supports all sql servers 2014-02-25 02:37:48 +11:00
Shannon
784f873777 updated to use constant 2014-02-25 02:36:25 +11:00
Shannon
a938605461 fixes merge issue 2014-02-25 02:33:48 +11:00
Shannon
bb9c968d3a fixes merge issues 2014-02-25 02:30:05 +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
Shannon
22b15a06f6 Fixes how member is approved is set by defaut and adds unit test for it. Also ensures that it returns true if the property value is invalid for whatever odd reason. 2014-02-25 02:10:25 +11:00
Shannon
cb09795280 Removes new member service Creating event, as only Created makes sense. Deprecates the other 'Creating' events with a note to just use the Created event. 2014-02-25 01:45:41 +11:00
perploug
81dfd0c6bc #U4-3649 Fixed 2014-02-24 15:35:25 +01:00
perploug
9f028e6d61 Replace Crop() with GetCropUrl() 2014-02-24 15:35:24 +01:00
Sebastiaan Janssen
ac57ec2211 Fixed U4-3648 v7, User without access to "Users" section can't change password 
Added change password dashboard back
 2014-02-24 13:15:45 +01:00
Sebastiaan Janssen
218bb28440 #U4-4245 Umbraco version number is really hard to see 
Moved the version to the top when clicking "help", moved the css into main.less and made the text a little bit darker for contrast
 2014-02-24 12:49:07 +01:00
Sebastiaan Janssen
d02b230f71 Fixes #U4-4195 7.0.X PropertyValueEditor.GetDatabaseType FormatException on different regional settings 2014-02-24 12:08:33 +01:00
Sebastiaan Janssen
289361c02f Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-02-24 11:59:05 +01:00
Sebastiaan Janssen
fc3020ffa4 #U4-4153 Fixed Macro snippets refer to 'MediaCurrent' and 'Show', also polishes other snippets a bit 2014-02-24 11:58:25 +01:00
perploug
7c4c44cf7e Enables the breadcrumb nav on media edit 2014-02-24 11:55:54 +01:00
perploug
458c51a955 Implements IHtmlString on imagecropdataset 2014-02-24 10:42:29 +01:00
perploug
f3d64bb85d Fixes broken file resolver due to wrong alias 2014-02-24 10:30:35 +01:00
perploug
8261a2b69b Fixes U4-4271 U7.1 Nightly build 16 YSOD when editing doc type 2014-02-24 09:36:10 +01:00
Sebastiaan Janssen
a5637af2d8 Adding missing CreateMember method that also as a convenience allows you to pass in the member type alias instead of a whole membertype 2014-02-22 18:32:26 +01: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
Sebastiaan Janssen
683ddf6d34 Apparently we rely on <error404>1</error404> to be in umbracoSettings.config 2014-02-22 16:03:59 +01:00
Sebastiaan Janssen
eda33b1ac4 Update incorrect summary 2014-02-22 14:47:59 +01:00
Sebastiaan Janssen
ed0f884348 Been a while: properly syncing /config/*.config with /config/*.Release.config 2014-02-21 17:50:58 +01:00
Sebastiaan Janssen
b561351340 Update UI.Release.xml with the correct Partial View references 2014-02-21 17:33:19 +01:00
Sebastiaan Janssen
690ab29863 Use the database "agnostic" query for this (see U4-3876) 2014-02-21 17:01:59 +01:00
Shannon
a1b3345671 fixes last unit test 2014-02-21 18:09:46 +11:00
Shannon
e1022bd5a1 fixes another test 2014-02-21 18:04:15 +11:00