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

78 Commits

Author SHA1 Message Date
Shannon
01644e8f6c Upgraded installer to do a two part install - first install then if an upgrade is required do the upgrade in a second call - this way we can have the progress bar update since the media xml installer can take some time. 2013-12-13 12:34:57 +11:00
Shannon
eaac76cdc1 Fixes: U4-3821 Infinite redirect loop when upgrading from 7.0.0 to 7.0.1 and ensures media cache is rebuilt on upgrade 2013-12-10 11:51:03 +11:00
Shannon
48b3806129 adds umbraco session id to UserData so we can use for csrf 2013-11-29 12:42:50 +11:00
Shannon
9fc8e18881 Fixes csrf issue 
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/umbraco/logout.aspx
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
	src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
 2013-11-29 12:17:58 +11:00
Sebastiaan Janssen
a04aef9b98 U4-3623 Text corrections in install wizard 2013-11-21 10:17:52 +01:00
Sebastiaan Janssen
2beb3c5b4c Merge branch 'master' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	.gitignore
 2013-11-20 14:50:57 +01:00
Sebastiaan Janssen
7e70253e1c U4-3340 Installer: Make SQL CE Default option 2013-11-19 16:06:14 +01:00
Per Ploug Krogslund
7440855c72 merge 2013-11-07 17:16:22 +01:00
Sebastiaan Janssen
5659ab5fc0 Remove promise of image galleries and blogs in installer screen. :) 2013-11-05 14:26:28 +01:00
Niels Hartvig
5a690bcf33 Add progress status on starter kit install 2013-11-05 11:24:53 +01:00
perploug
9ab423a280 New installer colors 2013-11-04 21:17:18 +01:00
perploug
47733b2bbe starterkits html for installer 2013-11-04 14:58:25 +01:00
perploug
34f0576a90 Fixes: missign web-service reference in installer 2013-11-01 09:42:24 +01:00
Shannon
c722e57914 Moves the our umbraco web reference to where it needs to be. 2013-11-01 09:21:29 +11:00
perploug
ce509638e1 Added 7.0 starterkit feed to installer 2013-10-30 19:34:35 +01:00
Shannon
3f5fdf840a Completes: U4-3212 Support unlocking a member, also fixes quite a few other issues regarding the membership provider properties of the content type. 2013-10-22 17:36:46 +11:00
Shannon
90c76ae465 Merge remote-tracking branch 'origin/6.2.0-membershipprovider' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/install/steps/DefaultUser.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-10-22 13:45:23 +11:00
Shannon
680a4b9570 Fixes a lot - 
U4-3208 Ensure all membership provider properties exist on the default Member type shipped with Umbraco
U4-3158 user back office password policies doesn't adhere to membership provider rules
and even more fixes to the membership provider like actually integrating the last locked out date and last pword change date. Fixes member creation to actually use the membership provider - this means that the password is created properly based on the provider config. Fixes the provider to have default fields specified so people don't actually have to specify in config.
 2013-10-22 13:41:04 +11:00
Shannon
d281f97659 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
 2013-10-09 11:12:33 +11:00
Sebastiaan Janssen
fd5de171c9 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-10-06 16:45:31 +02:00
Sebastiaan Janssen
2d83ba06a5 Fix small styling issues in installer 2013-10-05 19:18:11 +02:00
Shannon
55247fe31d Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :) 2013-10-03 12:45:40 +10:00
Shannon
1e9a17babe Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen. 2013-09-25 19:23:41 +10:00
Shannon
b2e2a2b004 removes the old skinning.config and updates the installer to not show that option. 2013-09-25 18:18:36 +10:00
Shannon
a939c14de9 Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support 2013-09-25 17:57:44 +10:00
Shannon
a4717c5cb9 Creates all of the macro parameter db upgrade scripts, fixes folder browser alias 2013-09-19 12:53:12 +10:00
Shannon
bd644bc707 Simplifies more of the interface config collection to reduce nesting. 2013-09-16 16:16:42 +10: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
f38a6e1561 Makes some massive headway with the real config section, have got all code re-delegated to using it and have migrated the baserest config to the core project, all configs will be shared out of the UmbracoConfiguration singleton, now to get the unit tests all wired up and using mocks for the most part. 2013-09-13 18:11:20 +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
e962e86c3c Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/MemberReadOnlyDto.cs
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-09-10 11:49:05 +10:00
Sebastiaan Janssen
edd9aa80ae Fixes U4-489 Installer, link to folder permission video broken 2013-09-08 21:18:00 +02:00
Shannon
7806762b80 Implemented a real .Net configuration section for umbracoSettings.config + unit tests for every property. NOTE: This isn't referenced in the codebase yet, going to start setting default values for most of the properties so that we can remove them from the config file for shipping (ship minimal config) then reference these settings in the codebase. 2013-08-31 11:28:19 +10:00
Shannon
733b6aa945 Completes: U4-2742 Remove legacy xsltExtensions.config - xslt extensions are configured using attributes 2013-08-29 17:14:34 +10:00
Shannon
cd7f737fa6 Removes remaining references to the restExtensions.config 2013-08-29 15:55:58 +10:00
Sebastiaan Janssen
1e76cf67d3 Fix merge problem 2013-08-23 08:57:02 +02:00
Sebastiaan Janssen
61149f8112 Merge branch '6.1.4' 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/install/steps/database.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
	src/umbraco.editorControls/mediapicker/mediaChooser.cs
 2013-08-22 14:46:11 +02:00
Shannon
6f464567bb Implements real FormsAuthentication for back office cookie authentication... finally :) 2013-07-31 17:08:56 +10:00
Shannon
4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-23 13:41:42 +10:00
Sebastiaan Janssen
61d072c8d6 Fix merge issue 2013-07-19 13:32:24 +02:00
Sebastiaan Janssen
8740848aac Merge pull request #42 from michielvoo/u4-232 
Enabled support for integrated security for SQL Server to the installer.
Conflicts:
	src/Umbraco.Web.UI/install/steps/database.ascx
 2013-07-19 13:29:07 +02:00
Sebastiaan Janssen
60867af1a7 Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico 
Also fixes casing of folder names
 2013-07-15 16:31:19 +02:00
Per Ploug
df98ad4edf Sets the installer redirect to umbraco/default 2013-07-08 15:54:07 +02:00
Michiel van Oosterhout
d926180e3a Added special overload for creating a connection string with integrated security. 
Actually disable checkbox is the selected database type is not Microsoft SQL Server.
Refactored saveDBConfig for readability.
 2013-06-28 16:40:23 +02:00
Michiel van Oosterhout
e980296d6d Enabled support for integrated security for SQL Server to the installer. 2013-06-28 10:39:48 +02:00
Shannon
68a648d3ba Merge remote-tracking branch 'origin/6.1.2' into 7.0.0 
Conflicts:
	.hgignore
 2013-06-25 10:01:23 +10:00
Sebastiaan Janssen
bd77463fa4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Core/Models/ContentTypeBase.cs
	src/Umbraco.Core/Models/IContentTypeBase.cs
	src/Umbraco.Core/Models/PropertyGroupCollection.cs
 2013-06-24 12:06:58 +02:00
Michiel van Oosterhout
16a46a4ea4 Changed default user email address to use the example domain, instead of domain.com 2013-06-23 16:01:04 +02:00
Michiel van Oosterhout
0b0fb92cf1 Changed default user email address to use the example domain, instead of domain.com 2013-06-20 16:01:03 +02:00
Shannon
a7b546527c Added more methods to User Repo/Service to get an IUser by id. Upgraded to angular 1.5.5 to fix an animation bug. Got authorization working nicely now. Fixed up the animation.less files with 1.5.5's breaking animation changes. Fixed up WebSecurity class to always have an instance of HttpContextBase (still requires much more fixing though). 2013-06-17 16:03:27 +10:00