diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-27 07:05:51 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-27 07:05:51 -0800 |
| commit | cf48d319968262e3c7f7322ea17fedcd3819d743 (patch) | |
| tree | dcc71264953aaf07b62aae065c4aff6d10a83a16 /samples/OpenIdProviderWebForms | |
| parent | a3538a47a43eb00461f68fb542097871f732429a (diff) | |
| parent | 505a4ae9f092e8092cc7d3b142b05614fda318f2 (diff) | |
| download | DotNetOpenAuth-cf48d319968262e3c7f7322ea17fedcd3819d743.zip DotNetOpenAuth-cf48d319968262e3c7f7322ea17fedcd3819d743.tar.gz DotNetOpenAuth-cf48d319968262e3c7f7322ea17fedcd3819d743.tar.bz2 | |
Merge branch 'v3.3'
Conflicts:
samples/InfoCardRelyingParty/Site.Master
samples/OpenIdProviderWebForms/Site.Master
samples/OpenIdRelyingPartyClassicAsp/MembersOnly.asp
samples/OpenIdRelyingPartyClassicAsp/default.asp
samples/OpenIdRelyingPartyClassicAsp/login.asp
samples/OpenIdRelyingPartyWebForms/Site.Master
src/DotNetOpenAuth.vsmdi
src/DotNetOpenAuth/Configuration/DotNetOpenAuth.xsd
src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs
Diffstat (limited to 'samples/OpenIdProviderWebForms')
| -rw-r--r-- | samples/OpenIdProviderWebForms/Site.Master | 4 | ||||
| -rw-r--r-- | samples/OpenIdProviderWebForms/Web.config | 14 | ||||
| -rw-r--r-- | samples/OpenIdProviderWebForms/server.aspx | 2 |
3 files changed, 7 insertions, 13 deletions
diff --git a/samples/OpenIdProviderWebForms/Site.Master b/samples/OpenIdProviderWebForms/Site.Master index 3ee5236..bc4f933 100644 --- a/samples/OpenIdProviderWebForms/Site.Master +++ b/samples/OpenIdProviderWebForms/Site.Master @@ -9,9 +9,9 @@ </head> <body> <form id="form1" runat="server"> - <div><a href="http://dotnetopenid.googlecode.com"> + <div><a href="http://dotnetopenauth.net"> <img runat="server" src="~/images/DotNetOpenAuth.png" title="Jump to the project web site." - alt="DotNetOpenId" border='0' /></a> </div> + alt="DotNetOpenAuth" border='0' /></a> </div> <div> <asp:ContentPlaceHolder ID="Main" runat="server" /> </div> diff --git a/samples/OpenIdProviderWebForms/Web.config b/samples/OpenIdProviderWebForms/Web.config index 6d24ee6..845f541 100644 --- a/samples/OpenIdProviderWebForms/Web.config +++ b/samples/OpenIdProviderWebForms/Web.config @@ -1,12 +1,4 @@ <?xml version="1.0"?> -<!-- - Note: As an alternative to hand editing this file you can use the - web admin tool to configure settings for your application. Use - the Website->Asp.Net Configuration option in Visual Studio. - A full list of settings and comments can be found in - machine.config.comments usually located in - \Windows\Microsoft.Net\Framework\v2.x\Config ---> <configuration> <configSections> <section name="uri" type="System.Configuration.UriSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/> @@ -43,7 +35,7 @@ </settings> </system.net> - <!-- this is an optional configuration section where aspects of dotnetopenid can be customized --> + <!-- this is an optional configuration section where aspects of DotNetOpenAuth can be customized --> <dotNetOpenAuth> <openid> <provider> @@ -66,6 +58,8 @@ </whitelistHosts> </untrustedWebRequest> </messaging> + <!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. --> + <reporting enabled="true" /> </dotNetOpenAuth> <system.web> @@ -125,7 +119,7 @@ </authorization> </system.web> </location> - <!-- log4net is a 3rd party (free) logger library that dotnetopenid will use if present but does not require. --> + <!-- log4net is a 3rd party (free) logger library that DotNetOpenAuth will use if present but does not require. --> <log4net> <appender name="RollingFileAppender" type="log4net.Appender.RollingFileAppender"> <file value="Provider.log"/> diff --git a/samples/OpenIdProviderWebForms/server.aspx b/samples/OpenIdProviderWebForms/server.aspx index d3ce78d..a874ccd 100644 --- a/samples/OpenIdProviderWebForms/server.aspx +++ b/samples/OpenIdProviderWebForms/server.aspx @@ -25,7 +25,7 @@ <table> <tr> <td> - <a href="http://dotnetopenid.googlecode.com/">http://dotnetopenid.googlecode.com/</a> + <a href="http://dotnetopenauth.net/">http://dotnetopenauth.net/</a> </td> <td> Home of this library |