yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222

Browse Source 
Conflicts:
	src/Umbraco.Core/Security/BackOfficeUserManager.cs
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/routes.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
This commit is contained in:
Shannon
2016-04-12 18:07:25 +02:00
parent 36255709e6
commit 1361e017a2
25 changed files with 664 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Security/BackOfficeUserManager.cs
View File

@@ -132,7 +132,7 @@ namespace Umbraco.Core.Security
// BodyFormat = "Your security code is: {0}"
//});
//manager.EmailService = new EmailService();
manager.EmailService = new EmailService();
//manager.SmsService = new SmsService();
}