This repository was archived by the owner on Sep 21, 2018. It is now read-only.
Cannot link external logins in 1.0.0/1.0.1 Individual auth templates #726
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ncremental builds in VS. (#628)
# Conflicts: # src/Rules/StarterWeb/AI/IndividualAuth/project.json # src/Rules/StarterWeb/IndividualAuth/project.json # src/project.json
* site.css formatted properly - Opening curly brace in same line - 4 spaces indentation * /src/Rules/StarterWeb/IndividualAuth/wwwroot/css/site.css also formatted properly
…n project.json files.
* Add AccessDenied.cshtml for CookieAuthentication Fixes #608 * Add comments and attributes to Organizational Auth Account controller.
Clear the external cookie in Login Action when it exists.
Tooling packages renamed in dotnet/efcore#6288
Since the user is prompted for an email to reset their password, use that to look up their user account, rather than the `UserName` field. This makes a difference if you have decoupled those two fields, allowing the user to specify their username rather than storing the email to both. Fixes #865
…rs_bug_656_use_https
…the (#666) same lines as the tabs)
|
Looks good to me, are you going to port the other change from dev as well? Might be best to do the two fixes together |
|
I plan on cherry-picking the other changes and pushing them all together next week, |
# Conflicts: # Templates.Settings.targets # src/BaseTemplates/BaseProjectTemplates.csproj # src/BaseTemplates/EmptyWeb/Project_Readme.html # src/BaseTemplates/EmptyWeb/project.json # src/BaseTemplates/StarterWeb/Project_Readme.html # src/BaseTemplates/StarterWeb/project.json # src/BaseTemplates/WebAPI/Project_Readme.html # src/BaseTemplates/WebAPI/project.json # src/Rules/StarterWeb/AI/IndividualAuth/Startup.cs # src/Rules/StarterWeb/AI/IndividualAuth/project.json # src/Rules/StarterWeb/AI/NoAuth/project.json # src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json # src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/NoRead/Startup.cs # src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Read/Startup.cs # src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Common/project.json # src/Rules/StarterWeb/AI/OrganizationalAuth/Single/NoRead/Startup.cs # src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Read/Startup.cs # src/Rules/StarterWeb/IndividualAuth/project.json # src/Rules/StarterWeb/OrganizationalAuth/Common/project.json # src/Rules/WebAPI/AI/NoAuth/project.json # src/Rules/WebAPI/AI/OrganizationalAuth/Single/Startup.cs # src/Rules/WebAPI/AI/OrganizationalAuth/Single/project.json # src/Rules/WebAPI/OrganizationalAuth/Single/Startup.cs # src/Rules/WebAPI/OrganizationalAuth/Single/project.json # src/TemplateRules.csproj # src/Templates.xml # src/project.json
phenning
force-pushed
the
phenning/linkLogin
branch
from
d8b05fb to
e6b0807
Compare
|
Merged via dev |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #686
@mlorbetske, @joeloff, @HaoK