Sebastiaan Janssen
d87b268a40
Update to MVC5
2015-07-30 17:08:39 +02:00
Shannon
d2deaf0375
Fixes MVC references and updates to 4.0.0.1
2015-05-11 12:43:45 +10:00
Shannon
95ff94c532
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Core/packages.config
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
src/Umbraco.Web/Editors/AuthenticationController.cs
src/Umbraco.Web/packages.config
2015-05-11 12:26:53 +10:00
Shannon
d94b334375
Moves login logging to the provider level
2015-05-11 12:22:56 +10:00
Shannon
a4a49b1466
Revert "Fixes MVC 4.0.0.1 problem once and for all." - All MVC ref's are 4.0.0.0, no web config transforms (also there was never a 4.0.0.1 version of System.Net.Http). Everything works on my machine now, even with 4.0.0.1 installed in the GAC.
2015-05-11 11:45:13 +10:00
Shannon
3be1cd8b0d
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/SolutionInfo.cs
src/Umbraco.Core/packages.config
src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/packages.config
2015-05-07 16:24:29 +10:00
Shannon
1cac4ed075
Fixes MVC 4.0.0.1 problem once and for all.
2015-05-07 08:10:45 +10:00
Shannon
ff602da0fa
Updates owin packages and updates the web.config tempate for owin redirects
2015-04-01 13:41:45 +11:00
Shannon
a2a8c8fbd7
updated to latest owin
2015-04-01 13:41:36 +11:00
Shannon
927add6f44
Updates UmbracoBackOfficeIdentity to add claims and adds a new ctor so people can create an identity manually - this is really the key, by doing this we'd already be able to have 3rd party authentication happening. Ensures our custom secure data format persists the user data
2015-04-01 13:41:21 +11:00
Sebastiaan Janssen
a1c223bc2b
Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken.
...
Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.
2014-11-26 10:43:46 +01:00
Sebastiaan Janssen
f4231b1692
Upgrade to System.Web.Mvc 4.0.0.1 (or 4.0.40804.0 whatever you want to call it)
2014-10-17 17:24:32 +02:00
Shannon
df3bc873df
Upgrades mini profiler and enables it in the back offfice.
2014-05-30 15:26:22 +10:00
Shannon
d9ac529e7e
Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
...
Conflicts:
src/Umbraco.Core/Models/PropertyType.cs
src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
src/Umbraco.Web/WebServices/CoreStringsController.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-04-24 16:33:04 +10:00
Shannon
2621b25fd3
Ensures that member saving events don't get raised for normal member operations like validating and getting a user and flagging them as online. This fixes: U4-3451 Cache on Partial View refreshed, after member execute login
2014-04-24 16:28:37 +10:00
Shannon
61055380c5
Ensures that member saving events don't get raised for normal member operations like validating and getting a user and flagging them as online. This fixes: U4-3451 Cache on Partial View refreshed, after member execute login
2014-04-24 16:26:21 +10:00
Shannon
02481dcfba
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Core/Configuration/UmbracoSettings.cs
2014-03-18 18:53:04 +11:00
Shannon
caad775399
Removes the User membership provider name constant - it is not a constant, this value is configurable!
2014-03-18 18:52:17 +11:00
Shannon
fd14065f14
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Core/Models/Member.cs
src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs
src/Umbraco.Core/Persistence/Factories/MemberFactory.cs
src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Mappers/MemberMapper.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Services/IMembershipUserService.cs
src/Umbraco.Core/Services/UserService.cs
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
src/Umbraco.Tests/Services/ContentServiceTests.cs
src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
src/Umbraco.Web.UI/install/steps/DefaultUser.ascx.cs
src/Umbraco.Web/Controllers/UmbProfileController.cs
src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
src/Umbraco.Web/Security/WebSecurity.cs
src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs
src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs
src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/MediaUploader.ashx.cs
2014-03-18 18:47:49 +11:00
Shannon
e2881e07d1
Ensures that all calls to the members membership provider are done so explicitly with the membership provider alias - this decouples the need to have the umbraco membership provider declared as the default, we were doing both before.
2014-03-18 17:08:21 +11:00
Shannon
f777f1b3d6
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-03-17 16:23:49 +11:00
Shannon
30cfa4c0ae
moves MemberCountType to correct namespace
2014-03-17 14:18:38 +11:00
Shannon
66aa3084f9
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/packages.config
src/umbraco.cms/packages.config
src/umbraco.cms/umbraco.cms.csproj
src/umbraco.controls/packages.config
src/umbraco.editorControls/packages.config
src/umbraco.macroRenderings/packages.config
src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
2014-03-17 14:15:14 +11:00
Shannon
d028ee2c3e
Completes: U4-4457 Upgrade to latest CDF
2014-03-17 14:08:07 +11:00
Shannon
64c126ea61
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Core/Configuration/GlobalSettings.cs
src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-03-14 19:33:53 +11:00
Shannon
b5329ace3b
Backports fixes for legacy encoding checks and to not do any db lookups for the new membership providers and also ensures the legacy membership provider doesn't do any db lookups on init.
2014-03-14 18:38:57 +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
Shannon
3c3f2d7c8d
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Core/Constants-Conventions.cs
src/Umbraco.Core/DateTimeExtensions.cs
src/Umbraco.Core/Models/PropertyType.cs
src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
src/Umbraco.Tests/App.config
src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
src/Umbraco.Tests/packages.config
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/app.config
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
src/umbraco.MacroEngines/App.Config
src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-02-21 16:32:53 +11:00
Shannon
c677f36f08
Changes some of the naming conventions for the underlying membership provider services bits.
2014-02-21 16:03:32 +11:00
Shannon
09b9056fb0
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-20 14:39:23 +11:00
Shannon
d159792256
Updates last step of installer logic, we don't care about other providers as that would never have worked anyways
2014-02-20 14:38:00 +11:00
Shannon
846f4b5b6c
Removes the various old hacks for the legacy user's membership provider, now that we have the AllowManuallyChangingPassword flag, these hacks are not required.
2014-02-17 19:32:04 +11:00
Shannon
8154382fb1
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-02-17 13:17:19 +11:00
Shannon
10ef5eb7bc
adds new interface for members' membership providers to implement so we know what aliases to store data against.
2014-02-17 13:16:28 +11:00
Shannon
c4acbf0dbc
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
...
Conflicts:
src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs
src/Umbraco.Core/Constants-Conventions.cs
src/Umbraco.Core/Models/Member.cs
src/Umbraco.Core/Models/Membership/IUser.cs
src/Umbraco.Core/Models/Template.cs
src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
src/Umbraco.Core/Persistence/RepositoryFactory.cs
src/Umbraco.Core/Services/ContentService.cs
src/Umbraco.Core/Services/IMemberTypeService.cs
src/Umbraco.Core/Services/IMembershipUserService.cs
src/Umbraco.Core/Services/IUserService.cs
src/Umbraco.Core/Services/MemberService.cs
src/Umbraco.Core/Services/MemberTypeService.cs
src/Umbraco.Core/Services/ServiceContext.cs
src/Umbraco.Core/Services/UserService.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/MockTests.cs
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Breadcrumb.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListAncestorsFromCurrentPage.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesFromCurrentPage.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesOrderedByDate.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesOrderedByName.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListChildPagesWithDoctype.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/ListDescendantsFromCurrentPage.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/MultinodeTree-picker.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Navigation.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/SiteMap.cshtml
src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.cs
src/Umbraco.Web.UI/config/umbracoSettings.config
src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
src/Umbraco.Web/Controllers/UmbLoginController.cs
src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
src/Umbraco.Web/Controllers/UmbProfileController.cs
src/Umbraco.Web/Controllers/UmbRegisterController.cs
src/Umbraco.Web/Models/LoginModel.cs
src/Umbraco.Web/Models/LoginStatusModel.cs
src/Umbraco.Web/Models/ProfileModel.cs
src/Umbraco.Web/Models/RegisterModel.cs
src/Umbraco.Web/Models/UmbracoProperty.cs
src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
src/Umbraco.Web/Security/WebSecurity.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/UmbracoModule.cs
src/Umbraco.Web/WebApi/UmbracoApiController.cs
src/Umbraco.Web/umbraco.presentation/library.cs
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewMacrosTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbracobase/baseLibrary.cs
src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs
src/umbraco.businesslogic/User.cs
src/umbraco.providers/UsersMembershipProvider.cs
src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-02-13 16:22:51 +11:00
perploug
81c32716fe
Removes pre-checkpassword check
2014-01-29 22:04:37 +01:00
Shannon
7c4412fc4b
Ensures that Save() is called wherever member data is saved
2014-01-23 16:09:59 +11:00
Shannon
fb9569d914
Fixes user membership providers to throw exceptions on duplicate emails when the provider is configured to not allow duplicates.
2014-01-22 13:20:00 +11:00
Shannon
47974d49fe
obsoletes old providers, creates new membership role provider stub
2014-01-22 12:16:47 +11:00
Shannon
3f8b3031c2
completes: U4-3996 Fix EditUser to use the membership provider properly, U4-3997 Fix EditMember to use the membership provider properly
2014-01-22 11:57:33 +11:00
Shannon
43a61d8a06
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
...
Conflicts:
src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-01-16 20:15:35 +11:00
Shannon
122069752a
fixes legacy validate member logic
2014-01-16 20:03:29 +11:00
Shannon
fc18189fc8
fixes a null check on membership provider, completes: U4-3962 publicize IMapperConfiguration
2014-01-09 13:32:39 +11:00
Shannon
077f3468b9
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2014-01-08 18:20:49 +11:00
Shannon
21c5b6fe02
fixes user lookup on legacy provider
2014-01-08 18:20:18 +11:00
Shannon
d6a83d9887
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
...
Conflicts:
src/Umbraco.Core/Models/IMember.cs
src/Umbraco.Core/Models/Member.cs
src/Umbraco.Core/Models/Membership/IUser.cs
src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
src/Umbraco.Core/Models/Membership/User.cs
src/Umbraco.Core/Models/Membership/UserProfile.cs
src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
src/Umbraco.Core/Persistence/Factories/UserFactory.cs
src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
src/Umbraco.Core/Services/IMembershipUserService.cs
src/Umbraco.Core/Services/MemberService.cs
src/Umbraco.Core/Services/UserService.cs
src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs
src/Umbraco.Tests/Persistence/Repositories/ContentRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
src/Umbraco.Tests/Persistence/Repositories/UserTypeRepositoryTest.cs
src/Umbraco.Tests/Services/ContentServiceTests.cs
src/Umbraco.Tests/Services/UserServiceTests.cs
src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
src/Umbraco.Tests/TestHelpers/Entities/MockedUserType.cs
src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.cs
src/Umbraco.Web.UI/umbraco/dashboard/ChangePassword.ascx
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/ChangePassword.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
src/umbraco.businesslogic/User.cs
src/umbraco.providers/members/UmbracoMembershipProvider.cs
2014-01-08 14:32:38 +11:00
Shannon
0245efe3cb
Fixes the change password dashboard to work properly. Fixes the EditUser to property save the member and the user. Adds new (probably temporary) MembershipHelper which is used to update a MembershipUser. Updates the User model to ignore the membership properties that we currently cannot persist. Ensures the legacy User membership provider still looks for a typed membership user (which should never have happened). Fixes small issue with underlying membership provider trying to encrypt an empty string.
2014-01-07 17:01:22 +11:00
Shannon
cd82bc6d21
streamlined the new membership provider classes so now they all share the same logic and use IMembershipMemberService<T> which is used by both IMember and IUser services
2014-01-06 15:38:34 +11:00
Shannon
c3a6c7c473
fixes up more of the legacy user membership provider
2014-01-06 14:02:09 +11:00