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

9592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0d93db5f1f Fixes the order that descriptions are listed during install 2014-03-04 19:28:57 +11: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
92f6b5564d Fixes failing js unit tests 2014-03-03 13:21:30 +01: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
Sebastiaan Janssen
a20c11d438 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-02-26 22:52:38 +01:00
Sebastiaan Janssen
89b8d056a2 Fixes #U4-4310 Missing Curly Brace in Boolean Property Editor 2014-02-26 22:52:13 +01:00
Sebastiaan Janssen
8707348215 Merge pull request #307 from BatJan/7.1.0 
U4-4295 typo on front of admin
 2014-02-26 22:42:00 +01:00
Jan Skovgaard
70ba0cd592 U4-4295 typo on front of admin 2014-02-26 19:51:56 +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
perploug
24ae424207 Fixed: U4-3851 More specific error when saving a user with no Section checkbox selected 2014-02-26 15:53:16 +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
Sebastiaan Janssen
ffdf4e7256 Merge pull request #306 from coolmikkel/7.1.0 
Name of Media items easyer to read
 2014-02-26 09:46:19 +01:00
Shannon
f9475305bb more install bits 2014-02-26 18:25:59 +11:00
coolmikkel
0a6208f3ef Name of Media items easyer to read 
The contrast between the text color and background was to low. The text
color has to be darker - black would be the right one.
 2014-02-25 22:11:38 +01: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