Merge pull request #1 from pbros/dev

Merge from Dev

Author: pbros

README.md

@@ -164,7 +164,7 @@ Migrations are not a part of the repository - they are ignored in `.gitignore`.
 
 - STS:
 
-  - `Skoruba.IdentityServer4.STS.Identity` - [Quickstart UI for the IdentityServer4 with Asp.Net Core Identity and EF Core storage](https://github.com/IdentityServer/IdentityServer4.Samples/tree/master/Quickstarts/Combined_AspId_and_EFStorage)
+  - `Skoruba.IdentityServer4.STS.Identity` - project that contains the instance of IdentityServer4 and combine these samples - [Quickstart UI for the IdentityServer4 with Asp.Net Core Identity and EF Core storage](https://github.com/IdentityServer/IdentityServer4.Samples/tree/master/Quickstarts/Combined_AspId_and_EFStorage) and [damienbod - IdentityServer4 and Identity template](https://github.com/damienbod/IdentityServer4AspNetCoreIdentityTemplate)
 
 - Admin UI:
 
@@ -225,12 +225,14 @@ It is possible to define the configuration according the client type - by defaul
   - Api Scopes
   - Api Scope Claims
   - Api Secrets
+  - Api Properties
 
 **Identity Resources**
 
 - Actions: Add, Update, Remove
 - Entities:
   - Identity Claims
+  - Identity Properties
 
 ## Asp.Net Core Identity
 
@@ -266,15 +268,17 @@ It is possible to define the configuration according the client type - by defaul
   - [x] English
   - [x] Chinese
   - [x] Russian
+- [x] Manage profile
+- [x] Password reset
+- [x] Account linking
+- [x] Two-Factor Authentication (2FA)
+- [ ] User registration
 
 ### 1.1.0:
 
 - [ ] Add audit logs to track changes ([#61](https://github.com/skoruba/IdentityServer4.Admin/issues/61))
 - [ ] Create a project template using dotnet CLI - `dotnet new template`
   - [ ] Second template: The administration of the IdentityServer4 (without Asp.Net Core Identity) ([#79](https://github.com/skoruba/IdentityServer4.Admin/issues/79))
-- [ ] User registration / Password reset
-- [ ] Account linking
-- [ ] Manage profile
 
 ### 2.0.0:
 

src/Skoruba.IdentityServer4.Admin.EntityFramework.Identity/Entities/Identity/UserIdentityRole.cs

@@ -2,7 +2,7 @@
 
 namespace Skoruba.IdentityServer4.Admin.EntityFramework.Identity.Entities.Identity
 {
-	public class UserIdentityRole : IdentityRole<string>
+	public class UserIdentityRole : IdentityRole
 	{
 
 	}