huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'ka/dev' into dev

This commit is contained in:
Hao Kung 2015-10-16 14:02:41 -07:00
parent c847f9c50d aadae4163e
commit 79d3723df5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/IdentitySample.Mvc/Scripts/jquery.validate-vsdoc.js vendored
View File

@ -622,7 +622,7 @@ $.extend($.validator, {
return false; return false;
} }
} catch(e) { } catch(e) {
this.settings.debug && window.console && console.log("exception occured when checking element " + element.id this.settings.debug && window.console && console.log("exception occurred when checking element " + element.id
+ ", check the '" + rule.method + "' method", e); + ", check the '" + rule.method + "' method", e);
throw e; throw e;
} }

4
src/Microsoft.AspNet.Identity/Resources.resx
View File

@ -122,7 +122,7 @@
<comment>Error when optimistic concurrency fails</comment> <comment>Error when optimistic concurrency fails</comment>
</data> </data>
<data name="DefaultError" xml:space="preserve"> <data name="DefaultError" xml:space="preserve">
<value>An unknown failure has occured.</value> <value>An unknown failure has occurred.</value>
<comment>Default identity result error message</comment> <comment>Default identity result error message</comment>
</data> </data>
<data name="DuplicateEmail" xml:space="preserve"> <data name="DuplicateEmail" xml:space="preserve">
@ -281,4 +281,4 @@
<value>User is not in role '{0}'.</value> <value>User is not in role '{0}'.</value>
<comment>Error when a user is not in the role</comment> <comment>Error when a user is not in the role</comment>
</data> </data>
</root> </root>