Menu
▾
▴
subtext-commits — Mailing list for commit emails from the Subtext SVN repository
You can subscribe to this list here.
| 2006 |
Jan
(91) |
Feb
(443) |
Mar
(308) |
Apr
(103) |
May
(130) |
Jun
(89) |
Jul
(216) |
Aug
(284) |
Sep
(33) |
Oct
(136) |
Nov
(154) |
Dec
(97) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(66) |
Feb
(32) |
Mar
(104) |
Apr
(148) |
May
(137) |
Jun
(143) |
Jul
(3) |
Aug
(52) |
Sep
(83) |
Oct
(93) |
Nov
(18) |
Dec
(3) |
| 2008 |
Jan
(1) |
Feb
(1) |
Mar
(13) |
Apr
(32) |
May
(60) |
Jun
(61) |
Jul
(32) |
Aug
(28) |
Sep
(1) |
Oct
(2) |
Nov
(38) |
Dec
(28) |
| 2009 |
Jan
(29) |
Feb
(5) |
Mar
(25) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Extinfama <ext...@mr...> - 2011-01-24 23:25:13
|
Seu cliente de e-mail não pode ler este e-mail. E-mail comercial visualize-o em seu navegador [http://mr.marketingderesultado.net/link.php?M=1220192&N=6&L=15&F=T] [http://mr.marketingderesultado.net/link.php?M=1220192&N=6&L=16&F=T] E-mail enviado dentro das normas de "BOAS MANEIRAS" da ABEMD Associação Brasileira de Marketing Direto em http://mr.marketingderesultado.net/link.php?M=1220192&N=6&L=2&F=T [http://mr.marketingderesultado.net/link.php?M=1220192&N=6&L=3&F=T] Caso deseje não mais receber e-mails promocionais de: Extinfama [http://mr.marketingderesultado.net/link.php?M=1220192&N=6&L=16&F=T] Por favor clique aqui: Para ser removidos desta lista de contatos [http://mr.marketingderesultado.net/link.php?M=1220192&N=6&L=5&F=T] Campanha realizada pelo sistema Marketing de Resultado acesse: www.marketingderesultado.com |
|
From: A. O. p. s. a. R$300,00 (t. ú. <co...@se...> - 2010-09-22 10:52:16
|
Seu cliente de Email não pode ler este Email. Para visualizá-lo on-line, por favor, clique aqui: http://servidoral.co.cc/sistemadeenvio/display.php?M=247466&C=59416729e2b0dc2f98123ad7f3d1a587&S=4&L=3&N=1 Entre em contato agora mesmo ate...@gm... e se informe melhor sobre o atendimento para sites Para parar de receber nossos Emails:http://servidoral.co.cc/sistemadeenvio/unsubscribe.php?M=247466&C=59416729e2b0dc2f98123ad7f3d1a587&L=3&N=4 |
|
From: atende s. <co...@se...> - 2010-09-18 10:16:18
|
Seu cliente de Email não pode ler este Email. Para visualizá-lo on-line, por favor, clique aqui: http://servidoral.co.cc/sistemadeenvio/display.php?M=119838&C=c4c1e696c56e7f519075af081b88434a&S=3&L=2&N=1 Entre em contato agora mesmo ate...@gm... e se informe melhor sobre o atendimento para sites Para parar de receber nossos Emails:http://servidoral.co.cc/sistemadeenvio/unsubscribe.php?M=119838&C=c4c1e696c56e7f519075af081b88434a&L=2&N=3 |
|
From: <ha...@us...> - 2009-04-06 18:10:19
|
Revision: 3418
http://subtext.svn.sourceforge.net/subtext/?rev=3418&view=rev
Author: haacked
Date: 2009-04-06 18:09:57 +0000 (Mon, 06 Apr 2009)
Log Message:
-----------
Never tagged the 2.1.1 release.
Added Paths:
-----------
tags/Release2.1.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@go...> - 2009-03-28 21:09:04
|
Author: haacked
Date: Sat Mar 28 14:00:05 2009
New Revision: 3400
Added:
branches/haacked-issue11-remove-import/ (props changed)
- copied from r3399, /trunk/
Log:
Going to remove the .Text import code and import provider for issue #11.
|
|
From: <cod...@go...> - 2009-03-28 00:06:42
|
Author: haacked
Date: Fri Mar 27 16:35:38 2009
New Revision: 3398
Modified:
wiki/DeveloperGuide.wiki
Log:
Edited wiki page through web user interface.
Modified: wiki/DeveloperGuide.wiki
==============================================================================
--- wiki/DeveloperGuide.wiki (original)
+++ wiki/DeveloperGuide.wiki Fri Mar 27 16:35:38 2009
@@ -22,4 +22,13 @@
Fixed in r1000, r10001, and r10002
}}}
-Google code does a nice job of linking all that up.
\ No newline at end of file
+Google code does a nice job of linking all that up.
+
+= Private Branches =
+For medium to large features and bug fixes, please do the work in a
private branch and then request a code review before merging into trunk.
+
+Branch name should follow the following format: username-issue#-keyword
+
+For example, a private branch I created to work on issue #3, "Self
contained Skins", is:
+
+*haacked-issue3-skins*
\ No newline at end of file
|
|
From: <cod...@go...> - 2009-03-28 00:02:37
|
Author: haacked
Date: Fri Mar 27 16:32:47 2009
New Revision: 3397
Added:
branches/haacked-issue3-skins/ (props changed)
- copied from r3396, /trunk/
Log:
Creating a private branch for issue #3, self-contained skins
|
|
From: <cod...@go...> - 2009-03-27 23:58:35
|
Author: haacked
Date: Fri Mar 27 16:15:08 2009
New Revision: 3396
Added:
wiki/
wiki/DeveloperGuide.wiki
Log:
Created wiki page through web user interface.
Added: wiki/DeveloperGuide.wiki
==============================================================================
--- (empty file)
+++ wiki/DeveloperGuide.wiki Fri Mar 27 16:15:08 2009
@@ -0,0 +1,25 @@
+#labels Commiter,Developer,Guidelines
+#A guide to hacking on Subtext
+
+= Introduction =
+
+So you want to be a Subtext developer. Great! We're happy to have you.
However, there are a few guidelines we hope you'll follow to mesh well with
the rest of the team. We just moved into our new digs here at Google Code,
so bear with us while we flesh this out.
+
+
+= Details =
+
+When making a check-in to Subversion, please associate the check-in with
an issue via the checkin comment. For example, if the commit applies to
issue #123, then you'd do this:
+
+{{{
+issue #123: Fixed blah blah blah
+}}}
+
+But hopefully with something more descriptive.
+
+Likewise, when you resolve an issue, specify which revision or revisions
apply. For example:
+
+{{{
+Fixed in r1000, r10001, and r10002
+}}}
+
+Google code does a nice job of linking all that up.
\ No newline at end of file
|
|
From: <cod...@go...> - 2009-03-27 23:54:55
|
Author: haacked
Date: Fri Mar 27 16:35:52 2009
New Revision: 3399
Modified:
wiki/DeveloperGuide.wiki
Log:
Edited wiki page through web user interface.
Modified: wiki/DeveloperGuide.wiki
==============================================================================
--- wiki/DeveloperGuide.wiki (original)
+++ wiki/DeveloperGuide.wiki Fri Mar 27 16:35:52 2009
@@ -29,6 +29,4 @@
Branch name should follow the following format: username-issue#-keyword
-For example, a private branch I created to work on issue #3, "Self
contained Skins", is:
-
-*haacked-issue3-skins*
\ No newline at end of file
+For example, a private branch I created to work on issue #3, "Self
contained Skins", is: *haacked-issue3-skins*
\ No newline at end of file
|
|
From: <ha...@us...> - 2009-03-27 22:03:26
|
Revision: 3417
http://subtext.svn.sourceforge.net/subtext/?rev=3417&view=rev
Author: haacked
Date: 2009-03-27 22:03:10 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
Removing everything and adding a readme. The official subversion repo for Subtext is now at http://subtext.googlecode.com/svn/trunk/
Added Paths:
-----------
trunk/readme.txt
Removed Paths:
-------------
trunk/3rdPartyRecompiled/
trunk/BuildTools/
trunk/Docs/
trunk/SubtextSolution/
trunk/Utilities/
trunk/subtext2.2-upgrade-notes.txt
Added: trunk/readme.txt
===================================================================
--- trunk/readme.txt (rev 0)
+++ trunk/readme.txt 2009-03-27 22:03:10 UTC (rev 3417)
@@ -0,0 +1,3 @@
+The Subtext Subversion Repository has been moved to...
+
+ http://subtext.googlecode.com/svn/trunk/
\ No newline at end of file
Deleted: trunk/subtext2.2-upgrade-notes.txt
===================================================================
--- trunk/subtext2.2-upgrade-notes.txt 2009-03-13 06:31:07 UTC (rev 3416)
+++ trunk/subtext2.2-upgrade-notes.txt 2009-03-27 22:03:10 UTC (rev 3417)
@@ -1,18 +0,0 @@
-Upgrade notes from Subtext 2.1 to 2.2
---------------------------------------
-
-Web.config changes
- 1. Remove the Database section
- 2. Remove the Import section
- 3. Remove the HandlerConfiguration section
-
-UI changes
- 1. !IMPORTANT! Delete Default.aspx. Add the new AggDefault.aspx.
- 2. Removed the redundant hyperlink with id="AtomLink" and hyperlink with id="XmlLink"
- from MyLinks.ascx/Syndication.ascx in all the skins
- If you want to use Atom instead of Rss, just change the route with the name "rss"
- to point to the AtomHandler.
-
-Database changes
- 1. No Schema changes
- 2. Stored Proc changes
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 06:31:25
|
Revision: 3416
http://subtext.svn.sourceforge.net/subtext/?rev=3416&view=rev
Author: haacked
Date: 2009-03-13 06:31:07 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Updated the ccnet.tt file which actually generates our CCNET config file. I forgot I had that. :)
Modified Paths:
--------------
trunk/BuildTools/CCNET_Config/server/ccnet.tt
Modified: trunk/BuildTools/CCNET_Config/server/ccnet.tt
===================================================================
--- trunk/BuildTools/CCNET_Config/server/ccnet.tt 2009-03-13 06:25:21 UTC (rev 3415)
+++ trunk/BuildTools/CCNET_Config/server/ccnet.tt 2009-03-13 06:31:07 UTC (rev 3416)
@@ -2,8 +2,8 @@
<#@ output extension=".config" #>
<#
var releases = new Release[] {
- new Release { Name = "trunk", Branch = "trunk", VersionPrefix = "2.1.1."},
- new Release { Name = "Release2.1", Branch="branches/Release2.1", VersionPrefix ="2.1.0." }
+ new Release { Name = "trunk", Branch = "trunk", VersionPrefix = "2.2.0."},
+ new Release { Name = "Release2.1", Branch="branches/Release2.1", VersionPrefix ="2.1.1." }
};
#>
<cruisecontrol>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 06:25:30
|
Revision: 3415
http://subtext.svn.sourceforge.net/subtext/?rev=3415&view=rev
Author: haacked
Date: 2009-03-13 06:25:21 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Fix:2 - Email address now saved when creating a new blog.
Modified Paths:
--------------
trunk/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.cs
trunk/SubtextSolution/Subtext.Web/Install/Step03_CreateBlog.aspx.cs
Modified: trunk/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.cs 2009-03-13 06:21:36 UTC (rev 3414)
+++ trunk/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.cs 2009-03-13 06:25:21 UTC (rev 3415)
@@ -17,6 +17,7 @@
using Subtext.Framework;
using Subtext.Framework.Configuration;
using Subtext.Framework.Security;
+using System.Web;
namespace Subtext.Web.Install
{
@@ -99,7 +100,8 @@
{
//Changed the following method to public so all authentication tickets are handled by the same code.
SecurityHelper.SetAuthenticationTicket("HostAdmin", false, "HostAdmin");
- Response.Redirect(NextStepUrl);
+ string queryString = !String.IsNullOrEmpty(this.txtEmail.Text) ? "?email=" + HttpUtility.UrlEncode(txtEmail.Text) : string.Empty;
+ Response.Redirect(NextStepUrl + queryString);
}
else
{
Modified: trunk/SubtextSolution/Subtext.Web/Install/Step03_CreateBlog.aspx.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Install/Step03_CreateBlog.aspx.cs 2009-03-13 06:21:36 UTC (rev 3414)
+++ trunk/SubtextSolution/Subtext.Web/Install/Step03_CreateBlog.aspx.cs 2009-03-13 06:25:21 UTC (rev 3415)
@@ -84,6 +84,11 @@
if(Config.CreateBlog("TEMPORARY BLOG NAME", HostInfo.Instance.HostUserName, HostInfo.Instance.Password, Request.Url.Host, string.Empty, passwordAlreadyHashed) > -1)
{
+ if (!String.IsNullOrEmpty(Request.QueryString["email"])) {
+ Blog blog = Config.GetBlog(Request.Url.Host, string.Empty);
+ blog.Email = Request.QueryString["email"];
+ Config.UpdateConfigData(blog);
+ }
//We probably should have creating the blog authenticate the user
//automatically so this redirect doesn't require a login.
InstallationManager installManager = new InstallationManager(Subtext.Extensibility.Providers.Installation.Provider);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 06:21:46
|
Revision: 3414
http://subtext.svn.sourceforge.net/subtext/?rev=3414&view=rev
Author: haacked
Date: 2009-03-13 06:21:36 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Fix:2 - Email address now saved when creating a new blog.
Modified Paths:
--------------
branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.cs
branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step03_CreateBlog.aspx.cs
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.cs 2009-03-13 05:34:42 UTC (rev 3413)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.cs 2009-03-13 06:21:36 UTC (rev 3414)
@@ -17,6 +17,7 @@
using Subtext.Framework;
using Subtext.Framework.Configuration;
using Subtext.Framework.Security;
+using System.Web;
namespace Subtext.Web.Install
{
@@ -99,7 +100,8 @@
{
//Changed the following method to public so all authentication tickets are handled by the same code.
SecurityHelper.SetAuthenticationTicket("HostAdmin", false, "HostAdmin");
- Response.Redirect(NextStepUrl);
+ string queryString = !String.IsNullOrEmpty(this.txtEmail.Text) ? "?email=" + HttpUtility.UrlEncode(txtEmail.Text) : string.Empty;
+ Response.Redirect(NextStepUrl + queryString);
}
else
{
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step03_CreateBlog.aspx.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step03_CreateBlog.aspx.cs 2009-03-13 05:34:42 UTC (rev 3413)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step03_CreateBlog.aspx.cs 2009-03-13 06:21:36 UTC (rev 3414)
@@ -84,6 +84,11 @@
if(Config.CreateBlog("TEMPORARY BLOG NAME", HostInfo.Instance.HostUserName, HostInfo.Instance.Password, Request.Url.Host, string.Empty, passwordAlreadyHashed))
{
+ if (!String.IsNullOrEmpty(Request.QueryString["email"])) {
+ BlogInfo blog = Config.GetBlogInfo(Request.Url.Host, string.Empty);
+ blog.Email = Request.QueryString["email"];
+ Config.UpdateConfigData(blog);
+ }
//We probably should have creating the blog authenticate the user
//automatically so this redirect doesn't require a login.
InstallationManager.ResetInstallationStatusCache();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 05:34:48
|
Revision: 3413
http://subtext.svn.sourceforge.net/subtext/?rev=3413&view=rev
Author: haacked
Date: 2009-03-13 05:34:42 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Updating CCNET Config
Modified Paths:
--------------
trunk/BuildTools/CCNET_Config/server/ccnet.config
Modified: trunk/BuildTools/CCNET_Config/server/ccnet.config
===================================================================
--- trunk/BuildTools/CCNET_Config/server/ccnet.config 2009-03-13 05:25:20 UTC (rev 3412)
+++ trunk/BuildTools/CCNET_Config/server/ccnet.config 2009-03-13 05:34:42 UTC (rev 3413)
@@ -25,7 +25,7 @@
</sourcecontrol>
<labeller type="defaultlabeller">
- <prefix>2.1.1.</prefix>
+ <prefix>2.2.0.</prefix>
<incrementOnFailure>false</incrementOnFailure>
</labeller>
@@ -110,7 +110,7 @@
</sourcecontrol>
<labeller type="defaultlabeller">
- <prefix>2.1.0.</prefix>
+ <prefix>2.1.1.</prefix>
<incrementOnFailure>false</incrementOnFailure>
</labeller>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 05:25:21
|
Revision: 3412
http://subtext.svn.sourceforge.net/subtext/?rev=3412&view=rev
Author: haacked
Date: 2009-03-13 05:25:20 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Incrementing trunk version.
Modified Paths:
--------------
trunk/SubtextSolution/SolutionInfo.cs
trunk/SubtextSolution/VersionInfo.Designer.cs
Modified: trunk/SubtextSolution/SolutionInfo.cs
===================================================================
--- trunk/SubtextSolution/SolutionInfo.cs 2009-03-13 05:22:59 UTC (rev 3411)
+++ trunk/SubtextSolution/SolutionInfo.cs 2009-03-13 05:25:20 UTC (rev 3412)
@@ -20,7 +20,7 @@
/* [assembly: AssemblyVersion("1.0.4.0")] moved to VersionInfo.cs for automatic generation */
/* Removed [AssemblyFileVersion] since it defaults to AssemblyVersion */
/* Human Readable version. */
-[assembly: AssemblyInformationalVersion("2.1.1.0")]
+[assembly: AssemblyInformationalVersion("2.2.0.0")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: trunk/SubtextSolution/VersionInfo.Designer.cs
===================================================================
--- trunk/SubtextSolution/VersionInfo.Designer.cs 2009-03-13 05:22:59 UTC (rev 3411)
+++ trunk/SubtextSolution/VersionInfo.Designer.cs 2009-03-13 05:25:20 UTC (rev 3412)
@@ -11,5 +11,5 @@
// </auto-generated>
//------------------------------------------------------------------------------
-[assembly: AssemblyVersionAttribute("2.1.1.0")]
+[assembly: AssemblyVersionAttribute("2.2.0.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 05:23:05
|
Revision: 3411
http://subtext.svn.sourceforge.net/subtext/?rev=3411&view=rev
Author: haacked
Date: 2009-03-13 05:22:59 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Incrementing the version.
Modified Paths:
--------------
branches/Release2.1/SubtextSolution/SolutionInfo.cs
branches/Release2.1/SubtextSolution/Subtext.Framework/Configuration/UrlBasedBlogInfoProvider.cs
branches/Release2.1/SubtextSolution/VersionInfo.Designer.cs
Modified: branches/Release2.1/SubtextSolution/SolutionInfo.cs
===================================================================
--- branches/Release2.1/SubtextSolution/SolutionInfo.cs 2009-03-13 05:21:06 UTC (rev 3410)
+++ branches/Release2.1/SubtextSolution/SolutionInfo.cs 2009-03-13 05:22:59 UTC (rev 3411)
@@ -20,7 +20,7 @@
/* [assembly: AssemblyVersion("1.0.4.0")] moved to VersionInfo.cs for automatic generation */
/* Removed [AssemblyFileVersion] since it defaults to AssemblyVersion */
/* Human Readable version. */
-[assembly: AssemblyInformationalVersion("2.1.0.0")]
+[assembly: AssemblyInformationalVersion("2.1.1.0")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: branches/Release2.1/SubtextSolution/Subtext.Framework/Configuration/UrlBasedBlogInfoProvider.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Framework/Configuration/UrlBasedBlogInfoProvider.cs 2009-03-13 05:21:06 UTC (rev 3410)
+++ branches/Release2.1/SubtextSolution/Subtext.Framework/Configuration/UrlBasedBlogInfoProvider.cs 2009-03-13 05:22:59 UTC (rev 3411)
@@ -159,7 +159,7 @@
return GetAggregateBlog(mCacheKey);
}
- if (InstallationManager.IsOnLoginPage)
+ if (InstallationManager.IsOnLoginPage || InstallationManager.IsInInstallDirectory)
{
return null;
}
Modified: branches/Release2.1/SubtextSolution/VersionInfo.Designer.cs
===================================================================
--- branches/Release2.1/SubtextSolution/VersionInfo.Designer.cs 2009-03-13 05:21:06 UTC (rev 3410)
+++ branches/Release2.1/SubtextSolution/VersionInfo.Designer.cs 2009-03-13 05:22:59 UTC (rev 3411)
@@ -11,5 +11,5 @@
// </auto-generated>
//------------------------------------------------------------------------------
-[assembly: AssemblyVersionAttribute("2.1.0.0")]
+[assembly: AssemblyVersionAttribute("2.1.1.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 05:21:11
|
Revision: 3410
http://subtext.svn.sourceforge.net/subtext/?rev=3410&view=rev
Author: haacked
Date: 2009-03-13 05:21:06 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Shame on me! Checking in a merge without compiling and testing.
Modified Paths:
--------------
trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs
Modified: trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs 2009-03-13 05:19:11 UTC (rev 3409)
+++ trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs 2009-03-13 05:21:06 UTC (rev 3410)
@@ -19,7 +19,7 @@
}
protected void OnForgotButtonClick(object sender, EventArgs args) {
- BlogInfo currentBlog = Config.CurrentBlog;
+ Blog currentBlog = Config.CurrentBlog;
if (currentBlog == null)
{
FailureText.Text = "Sorry, but forgot password does not work for Host admins. Please read <a href=\"http://subtextproject.com/Home/FAQ/tabid/113/Default.aspx\" title=\"Subtext FAQ\">the FAQ</a> to reset your password.";
@@ -30,7 +30,7 @@
}
}
- private void ResetAdminPassword(BlogInfo currentBlog)
+ private void ResetAdminPassword(Blog currentBlog)
{
if (String.IsNullOrEmpty(currentBlog.Email) || currentBlog.Email != emailTextBox.Text || currentBlog.UserName != usernameTextBox.Text)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 05:19:20
|
Revision: 3409
http://subtext.svn.sourceforge.net/subtext/?rev=3409&view=rev
Author: haacked
Date: 2009-03-13 05:19:11 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Should now work with IIS 7 integrated mode. Need to test this out a bit more.
Modified Paths:
--------------
branches/Release2.1/SubtextSolution/Subtext.Web/Global.asax.cs
branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx
branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.designer.cs
branches/Release2.1/SubtextSolution/Subtext.Web/Install/Style/InstallationStyle.css
branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master
branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs
branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.designer.cs
branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/SystemStyle.css
branches/Release2.1/SubtextSolution/Subtext.Web/UI/Globals.cs
branches/Release2.1/SubtextSolution/Subtext.Web/Web.config
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Global.asax.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Global.asax.cs 2009-03-13 04:03:47 UTC (rev 3408)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Global.asax.cs 2009-03-13 05:19:11 UTC (rev 3409)
@@ -68,13 +68,7 @@
private const string BadConnectionStringPage = "~/SystemMessages/CheckYourConnectionString.aspx";
private const string DatabaseLoginFailedPage = "~/SystemMessages/DatabaseLoginFailed.aspx";
- /// <summary>
- /// Initializes a new instance of the <see cref="Global"/> class.
- /// </summary>
- public Global()
- {
- InitializeComponent();
- }
+ bool _logInitialized = false;
/// <summary>
/// Method called by the application on startup.
@@ -83,19 +77,8 @@
/// <param name="e"></param>
protected void Application_Start(Object sender, EventArgs e)
{
- //This line will trigger the configuration.
- log.Info("Application_Start - This is not a malfunction.");
+ _logInitialized = true;
}
-
- /// <summary>
- /// Method called when a session starts.
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- protected void Session_Start(Object sender, EventArgs e)
- {
-
- }
/// <summary>
/// Method called during at the beginning of each request.
@@ -103,32 +86,19 @@
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Application_BeginRequest(Object sender, EventArgs e)
- {
+ {
+ if (!_logInitialized) {
+ //This line will trigger the configuration.
+ log.Info("Application_Start - This is not a malfunction.");
+ _logInitialized = true;
+ }
+
//KLUDGE: This is required due to a bug in Log4Net 1.2.9.
// This should be fixed in the next release.
Log.SetBlogIdContext(NullValue.NullInt32);
}
/// <summary>
- /// Handles the EndRequest event of the Application control.
- /// </summary>
- /// <param name="sender">The source of the event.</param>
- /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
- protected void Application_EndRequest(Object sender, EventArgs e)
- {
- }
-
- /// <summary>
- /// Handles the AuthenticateRequest event of the Application control.
- /// </summary>
- /// <param name="sender">The source of the event.</param>
- /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
- protected void Application_AuthenticateRequest(Object sender, EventArgs e)
- {
- //Handled by Subtext.Web.HttpModules.AuthenticationModule in Subtext.Framework.
- }
-
- /// <summary>
/// Handles the Error event of the Application control.
/// </summary>
/// <param name="sender">The source of the event.</param>
@@ -247,16 +217,6 @@
}
/// <summary>
- /// Handles the End event of the Session control.
- /// </summary>
- /// <param name="sender">The source of the event.</param>
- /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
- protected void Session_End(Object sender, EventArgs e)
- {
-
- }
-
- /// <summary>
/// Handles the End event of the Application control.
/// </summary>
/// <param name="sender">The source of the event.</param>
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx 2009-03-13 04:03:47 UTC (rev 3408)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx 2009-03-13 05:19:11 UTC (rev 3409)
@@ -32,7 +32,7 @@
<asp:TextBox ID="txtUserName" runat="server" CssClass="textbox" ValidationGroup="HostAdministration" />
<asp:RequiredFieldValidator ID="vldHostUsernameRequired" runat="server" ControlToValidate="txtUserName" ValidationGroup="HostAdministration" Text="*" Display="Dynamic" />
- <label for="txtEmail">Email</label>
+ <label for="txtEmail">Email <span class="note">(Optional, but useful if you forget your Password)</span></label>
<asp:TextBox ID="txtEmail" runat="server" CssClass="textbox" />
<asp:RequiredFieldValidator ID="vldHostEmailRequired" runat="server" ControlToValidate="txtEmail" ValidationGroup="HostAdministration" Text="*" Display="Dynamic" />
<asp:RegularExpressionValidator ID="vldHostEmail" runat="server" ControlToValidate="txtEmail" ValidationGroup="HostAdministration" Text="*" ValidationExpression="^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$" ErrorMessage="Email address is not valid" Display="Dynamic" />
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.designer.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.designer.cs 2009-03-13 04:03:47 UTC (rev 3408)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx.designer.cs 2009-03-13 05:19:11 UTC (rev 3409)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1434
+// Runtime Version:2.0.50727.3074
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Install/Style/InstallationStyle.css
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Install/Style/InstallationStyle.css 2009-03-13 04:03:47 UTC (rev 3408)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Install/Style/InstallationStyle.css 2009-03-13 05:19:11 UTC (rev 3409)
@@ -193,4 +193,9 @@
.clear
{
clear: both;
+}
+
+.note {
+ color: #777;
+ font-style: italic;
}
\ No newline at end of file
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master 2009-03-13 04:03:47 UTC (rev 3408)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master 2009-03-13 05:19:11 UTC (rev 3409)
@@ -17,52 +17,33 @@
<asp:ContentPlaceHolder ID="instructionsPlaceholder" runat="server">
</asp:ContentPlaceHolder>
- <asp:PasswordRecovery ID="passwordRecovery" runat="server"
- MembershipProvider="SubtextMembershipProvider">
-
- <UserNameTemplate>
- <fieldset>
- <legend>Step 1</legend>
- <p>
- We cannot retrieve your password, but we can
- reset it and send you a new one.
- </p>
-
- <span class="error"><asp:literal runat="server" id="FailureText" /></span>
-
- <asp:Label ID="lblUsername" runat="Server" AssociatedControlID="UserName">Username</asp:Label>
- <asp:TextBox ID="UserName" runat="server" CssClass="textbox" ValidationGroup="ResetPassword" />
- <asp:requiredfieldvalidator runat="server"
- controltovalidate="UserName"
- errormessage="User Name Required"
- ValidationGroup="ResetPassword"
- id="UserNameRequired">
- *
- </asp:requiredfieldvalidator>
-
- <asp:Button ID="btnSubmitUsername" runat="server" CommandName="Submit" Text="Continue" ValidationGroup="ResetPassword" CssClass="button" />
- </fieldset>
- </UserNameTemplate>
+ <fieldset>
+ <legend>Reset Password</legend>
- <QuestionTemplate>
- <p class="salutation">Hello <asp:literal runat="server" id="UserName" />!</p>
- <p>To finish resetting your password, please answer the following question.</p>
- <span class="error"><asp:literal runat="server" id="FailureText" /></span>
- <fieldset>
- <legend>Password Reset Question</legend>
- <asp:Label ID="lblQuestion" runat="Server" AssociatedControlID="Answer"><asp:literal runat="server" id="Question" /></asp:Label>
- <asp:TextBox ID="Answer" runat="server" CssClass="textbox" ValidationGroup="ResetPassword" />
- <asp:requiredfieldvalidator runat="server" controltovalidate="Answer" errormessage="Answer." id="AnswerRequired" ValidationGroup="ResetPassword">*</asp:requiredfieldvalidator>
- <asp:Button ID="btnSubmitAnswer" runat="server" CommandName="Submit" Text="Reset" ValidationGroup="ResetPassword" CssClass="button" />
- </fieldset>
- </QuestionTemplate>
+ <asp:PlaceHolder ID="defaultInstructions" runat="server">
+ We cannot retrieve your password, but we can
+ reset it and send you a new one.
+ </asp:PlaceHolder>
- <SuccessTemplate>
- <p class="salutation">
- Your new password has been sent to you.
- Be sure to login and change it immediately.
- </p>
- </SuccessTemplate>
+ <span class="success"><asp:literal runat="server" id="Message" /></span>
+ <span class="error"><asp:literal runat="server" id="FailureText" /></span>
+ <asp:PlaceHolder ID="ResetForm" runat="server">
+ <asp:Label ID="lblUsername" runat="Server" AssociatedControlID="usernameTextBox">Username</asp:Label>
+ <asp:TextBox ID="usernameTextBox" runat="server" CssClass="textbox" />
+ <asp:requiredfieldvalidator runat="server"
+ controltovalidate="usernameTextBox"
+ errormessage="User Name Required"
+ id="UserNameRequired">
+ *
+ </asp:requiredfieldvalidator>
+ <asp:Label ID="lblEmail" runat="Server" AssociatedControlID="emailTextBox">Email</asp:Label>
+ <asp:TextBox ID="emailTextBox" runat="server" CssClass="textbox" />
+
+ <asp:Button ID="btnSubmitUsername" runat="server" OnClick="OnForgotButtonClick" Text="Continue" ValidationGroup="ResetPassword" CssClass="button" />
+ </asp:PlaceHolder>
+ </fieldset>
+
+
</asp:PasswordRecovery>
</div>
</form>
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs 2009-03-13 04:03:47 UTC (rev 3408)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs 2009-03-13 05:19:11 UTC (rev 3409)
@@ -1,8 +1,55 @@
using System;
+using Subtext.Extensibility.Providers;
+using Subtext.Framework;
+using Subtext.Framework.Configuration;
+using Subtext.Framework.Security;
namespace Subtext.Web.Skins._System
{
public partial class ForgotPassword : System.Web.UI.MasterPage
{
+ protected override void OnLoad(EventArgs e)
+ {
+ defaultInstructions.Visible = true;
+ if (Config.CurrentBlog == null) {
+ ResetForm.Visible = defaultInstructions.Visible = false;
+ FailureText.Text = "Sorry, but forgot password does not work for Host admins. Please read <a href=\"http://subtextproject.com/Home/FAQ/tabid/113/Default.aspx\" title=\"Subtext FAQ\">the FAQ</a> to reset your password.";
+ }
+ base.OnLoad(e);
+ }
+
+ protected void OnForgotButtonClick(object sender, EventArgs args) {
+ BlogInfo currentBlog = Config.CurrentBlog;
+ if (currentBlog == null)
+ {
+ FailureText.Text = "Sorry, but forgot password does not work for Host admins. Please read <a href=\"http://subtextproject.com/Home/FAQ/tabid/113/Default.aspx\" title=\"Subtext FAQ\">the FAQ</a> to reset your password.";
+ }
+ else
+ {
+ ResetAdminPassword(currentBlog);
+ }
+ }
+
+ private void ResetAdminPassword(BlogInfo currentBlog)
+ {
+ if (String.IsNullOrEmpty(currentBlog.Email) || currentBlog.Email != emailTextBox.Text || currentBlog.UserName != usernameTextBox.Text)
+ {
+ Message.Visible = false;
+ FailureText.Visible = true;
+ FailureText.Text = "Sorry, but the username and email provided did not match our records";
+ }
+ else
+ {
+ defaultInstructions.Visible = false;
+ Message.Visible = true;
+ FailureText.Visible = false;
+
+ string newPassword = SecurityHelper.ResetPassword();
+ EmailProvider.Instance().Send(currentBlog.Email, currentBlog.Email, "Your new password", "I've been told that you forgot your password. Here it is" +
+ Environment.NewLine + "\t" + newPassword);
+
+ Message.Text = "Password was reset and sent to your email address.";
+ }
+ }
}
}
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.designer.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.designer.cs 2009-03-13 04:03:47 UTC (rev 3408)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.designer.cs 2009-03-13 05:19:11 UTC (rev 3409)
@@ -32,12 +32,93 @@
protected global::System.Web.UI.WebControls.ContentPlaceHolder instructionsPlaceholder;
/// <summary>
- /// passwordRecovery control.
+ /// defaultInstructions control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
- protected global::System.Web.UI.WebControls.PasswordRecovery passwordRecovery;
+ protected global::System.Web.UI.WebControls.PlaceHolder defaultInstructions;
+
+ /// <summary>
+ /// Message control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Literal Message;
+
+ /// <summary>
+ /// FailureText control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Literal FailureText;
+
+ /// <summary>
+ /// ResetForm control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.PlaceHolder ResetForm;
+
+ /// <summary>
+ /// lblUsername control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Label lblUsername;
+
+ /// <summary>
+ /// usernameTextBox control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.TextBox usernameTextBox;
+
+ /// <summary>
+ /// UserNameRequired control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.RequiredFieldValidator UserNameRequired;
+
+ /// <summary>
+ /// lblEmail control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Label lblEmail;
+
+ /// <summary>
+ /// emailTextBox control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.TextBox emailTextBox;
+
+ /// <summary>
+ /// btnSubmitUsername control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btnSubmitUsername;
}
}
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/SystemStyle.css
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/SystemStyle.css 2009-03-13 04:03:47 UTC (rev 3408)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Skins/_System/SystemStyle.css 2009-03-13 05:19:11 UTC (rev 3409)
@@ -131,6 +131,11 @@
color: #c00;
}
+.success {
+ font-weight: bold;
+ color: #0c0;
+}
+
p.Small
{
margin-top: 12px;
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/UI/Globals.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/UI/Globals.cs 2009-03-13 04:03:47 UTC (rev 3408)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/UI/Globals.cs 2009-03-13 05:19:11 UTC (rev 3409)
@@ -35,6 +35,9 @@
get
{
BlogInfo blog = Config.CurrentBlog;
+ if (blog == null) {
+ return null;
+ }
BrowserDetectionService service = new BrowserDetectionService(HttpContext.Current, blog.Id);
BrowserInfo capabilities = service.DetectBrowserCapabilities();
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Web.config
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Web.config 2009-03-13 04:03:47 UTC (rev 3408)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Web.config 2009-03-13 05:19:11 UTC (rev 3409)
@@ -382,8 +382,8 @@
Since we are grabbing all requests after this,
make sure these pages do not rely on the URL Redirection service.
-->
- <add verb="*" path="*/images/IdenticonHandler.ashx" type="IdenticonHandler, Identicon"/>
- <add verb="*" path="*CaptchaImage.ashx" type="Subtext.Web.Controls.Captcha.CaptchaImageHandler, Subtext.Web.Controls"/>
+ <add verb="GET" path="*/images/IdenticonHandler.ashx" type="IdenticonHandler, Identicon"/>
+ <add verb="GET" path="*CaptchaImage.ashx" type="Subtext.Web.Controls.Captcha.CaptchaImageHandler, Subtext.Web.Controls"/>
<add verb="*" path="OPML.aspx" type="System.Web.UI.PageHandlerFactory"/>
<add verb="*" path="MainFeed.aspx" type="System.Web.UI.PageHandlerFactory"/>
<add verb="*" path="Install/*.aspx" type="System.Web.UI.PageHandlerFactory"/>
@@ -451,15 +451,96 @@
</system.web.extensions>
<!-- asp.net AJAX 1.0 config - used by Microsoft Internet Information Server (IIS) 7.0 -->
<system.webServer>
+ <defaultDocument>
+ <files>
+ <clear />
+ <add value="default.aspx" />
+ </files>
+ </defaultDocument>
<validation validateIntegratedModeConfiguration="false"/>
<modules>
- <add name="ScriptModule" preCondition="integratedMode" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
- </modules>
+ <add name="SubtextBasicAuthenticationModule" type="Subtext.Framework.Web.HttpModules.FormToBasicAuthenticationModule, Subtext.Framework" />
+ <add name="SubtextAuthenticationModule" type="Subtext.Framework.Web.HttpModules.AuthenticationModule, Subtext.Framework" />
+ <add name="InstallationCheckModule" type="Subtext.Framework.Web.HttpModules.InstallationCheckModule, Subtext.Framework" />
+ <add name="BlogRequestModule" type="Subtext.Framework.Web.HttpModules.BlogRequestModule, Subtext.Framework" />
+ <!-- asp.net AJAX 1.0 config -->
+ <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+ <add name="CompressionModule" type="Subtext.Framework.Web.HttpModules.CompressionModule, Subtext.Framework"/>
+ </modules>
<handlers>
+ <remove name="WebServiceHandlerFactory-Integrated"/>
+ <remove name="ScriptHandlerFactory"/>
+ <remove name="ScriptHandlerFactoryAppServices"/>
+ <remove name="ScriptResource"/>
+ <remove name="Asmx" />
+ <remove name="AppService" />
+ <remove name="WebResource" />
<remove name="WebServiceHandlerFactory-ISAPI-2.0"/>
+ <remove name="FtbWebResource" />
+ <remove name="IdenticonHandler" />
+ <remove name="CaptchaImage" />
+ <remove name="OPML" />
+ <remove name="MainFeed" />
+ <remove name="InstallDir" />
+ <remove name="Providers" />
+ <remove name="SystemMessages" />
+ <remove name="HostAdmin" />
+ <remove name="HostAdminSubDir" />
+ <remove name="Logout" />
+ <remove name="RsdHandler" />
+ <remove name="RsdAshxHandler" />
+ <remove name="CssHandler" />
+ <remove name="JsHandler" />
+ <remove name="UrlRewriteHandler" />
+ <remove name="Ico" />
+ <remove name="Css" />
+ <remove name="Js" />
+ <remove name="Jpg" />
+ <remove name="Png" />
+ <remove name="Gif" />
+ <remove name="Html" />
+ <remove name="Xml" />
+
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+
+ <!-- Static Files -->
+ <add name="Ico" verb="GET,HEAD" path="*.ico" type="System.Web.StaticFileHandler"/>
+ <add name="Css" verb="GET,HEAD" path="*.css" type="System.Web.StaticFileHandler"/>
+ <add name="Js" verb="GET,HEAD" path="*.js" type="System.Web.StaticFileHandler"/>
+ <add name="Jpg" verb="GET,HEAD" path="*.jpg" type="System.Web.StaticFileHandler"/>
+ <add name="Png" verb="GET,HEAD" path="*.png" type="System.Web.StaticFileHandler"/>
+ <add name="Gif" verb="GET,HEAD" path="*.gif" type="System.Web.StaticFileHandler"/>
+ <add name="Html" verb="GET,HEAD" path="*.html" type="System.Web.StaticFileHandler"/>
+ <add name="Xml" verb="GET,HEAD" path="*.xml" type="System.Web.StaticFileHandler"/>
+
+ <add name="Asmx" verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+ <add name="AppService" verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=1.0.61025.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+ <add name="WebResource" path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" />
+
+ <!-- This is for FTB 3.0 support -->
+ <add name="FtbWebResource" verb="GET" path="FtbWebResource.axd" type="FreeTextBoxControls.AssemblyResourceHandler, FreeTextBox"/>
+ <!--
+ Since we are grabbing all requests after this,
+ make sure these pages do not rely on the URL Redirection service.
+ -->
+ <add name="IdenticonHandler" verb="GET" path="*/images/IdenticonHandler.ashx" type="IdenticonHandler, Identicon"/>
+ <add name="CaptchaImage" verb="GET" path="*CaptchaImage.ashx" type="Subtext.Web.Controls.Captcha.CaptchaImageHandler, Subtext.Web.Controls"/>
+ <add name="OPML" verb="*" path="OPML.aspx" type="System.Web.UI.PageHandlerFactory"/>
+ <add name="MainFeed" verb="*" path="MainFeed.aspx" type="System.Web.UI.PageHandlerFactory"/>
+ <add name="InstallDir" verb="*" path="Install/*.aspx" type="System.Web.UI.PageHandlerFactory"/>
+ <add name="Providers" verb="*" path="Providers/*/*.aspx" type="System.Web.UI.PageHandlerFactory"/>
+ <add name="SystemMessages" verb="*" path="SystemMessages/*.aspx" type="System.Web.UI.PageHandlerFactory"/>
+ <add name="HostAdmin" verb="*" path="HostAdmin/*.aspx" type="System.Web.UI.PageHandlerFactory"/>
+ <add name="HostAdminSubDir" verb="*" path="HostAdmin/*/*.aspx" type="System.Web.UI.PageHandlerFactory"/>
+ <add name="Logout" verb="*" path="Logout.aspx" type="System.Web.UI.PageHandlerFactory"/>
+ <add name="RsdHandler" verb="GET" path="rsd.xml" type="Subtext.Framework.Web.Handlers.RsdHandler, Subtext.Framework"/>
+ <add name="RsdAshxHandler" verb="GET" path="rsd.xml.ashx" type="Subtext.Framework.Web.Handlers.RsdHandler, Subtext.Framework"/>
+ <add name="CssHandler" verb="GET" path="css.axd" type="Subtext.Framework.Web.Handlers.CssHandler, Subtext.Framework"/>
+ <add name="JsHandler" verb="GET" path="js.axd" type="Subtext.Framework.Web.Handlers.JsHandler, Subtext.Framework"/>
+ <!-- This will process any ext mapped to aspnet_isapi.dll -->
+ <add name="UrlRewriteHandler" verb="*" path="*.aspx" type="Subtext.Framework.UrlManager.UrlReWriteHandlerFactory, Subtext.Framework"/>
</handlers>
</system.webServer>
<runtime>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 04:04:09
|
Revision: 3408
http://subtext.svn.sourceforge.net/subtext/?rev=3408&view=rev
Author: haacked
Date: 2009-03-13 04:03:47 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Fixed up some UI bugs in the forgot password dialog.
Modified Paths:
--------------
trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs
Modified: trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs 2009-03-13 03:49:52 UTC (rev 3407)
+++ trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs 2009-03-13 04:03:47 UTC (rev 3408)
@@ -10,6 +10,7 @@
{
protected override void OnLoad(EventArgs e)
{
+ defaultInstructions.Visible = true;
if (Config.CurrentBlog == null) {
ResetForm.Visible = defaultInstructions.Visible = false;
FailureText.Text = "Sorry, but forgot password does not work for Host admins. Please read <a href=\"http://subtextproject.com/Home/FAQ/tabid/113/Default.aspx\" title=\"Subtext FAQ\">the FAQ</a> to reset your password.";
@@ -18,7 +19,7 @@
}
protected void OnForgotButtonClick(object sender, EventArgs args) {
- Blog currentBlog = Config.CurrentBlog;
+ BlogInfo currentBlog = Config.CurrentBlog;
if (currentBlog == null)
{
FailureText.Text = "Sorry, but forgot password does not work for Host admins. Please read <a href=\"http://subtextproject.com/Home/FAQ/tabid/113/Default.aspx\" title=\"Subtext FAQ\">the FAQ</a> to reset your password.";
@@ -29,19 +30,25 @@
}
}
- private void ResetAdminPassword(Blog currentBlog)
+ private void ResetAdminPassword(BlogInfo currentBlog)
{
if (String.IsNullOrEmpty(currentBlog.Email) || currentBlog.Email != emailTextBox.Text || currentBlog.UserName != usernameTextBox.Text)
{
+ Message.Visible = false;
+ FailureText.Visible = true;
FailureText.Text = "Sorry, but the username and email provided did not match our records";
}
else
{
+ defaultInstructions.Visible = false;
+ Message.Visible = true;
+ FailureText.Visible = false;
+
string newPassword = SecurityHelper.ResetPassword();
EmailProvider.Instance().Send(currentBlog.Email, currentBlog.Email, "Your new password", "I've been told that you forgot your password. Here it is" +
Environment.NewLine + "\t" + newPassword);
+
Message.Text = "Password was reset and sent to your email address.";
- defaultInstructions.Visible = false;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 03:50:11
|
Revision: 3407
http://subtext.svn.sourceforge.net/subtext/?rev=3407&view=rev
Author: haacked
Date: 2009-03-13 03:49:52 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Minor UI improvement so that the configure host screen explains why we want the email.
Modified Paths:
--------------
trunk/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx
trunk/SubtextSolution/Subtext.Web/Install/Style/InstallationStyle.css
Modified: trunk/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx 2009-03-13 03:35:06 UTC (rev 3406)
+++ trunk/SubtextSolution/Subtext.Web/Install/Step02_ConfigureHost.aspx 2009-03-13 03:49:52 UTC (rev 3407)
@@ -32,7 +32,7 @@
<asp:TextBox ID="txtUserName" runat="server" CssClass="textbox" ValidationGroup="HostAdministration" />
<asp:RequiredFieldValidator ID="vldHostUsernameRequired" runat="server" ControlToValidate="txtUserName" ValidationGroup="HostAdministration" Text="*" Display="Dynamic" />
- <label for="txtEmail">Email</label>
+ <label for="txtEmail">Email <span class="note">(Optional, but useful if you forget your Password)</span></label>
<asp:TextBox ID="txtEmail" runat="server" CssClass="textbox" />
<asp:RequiredFieldValidator ID="vldHostEmailRequired" runat="server" ControlToValidate="txtEmail" ValidationGroup="HostAdministration" Text="*" Display="Dynamic" />
<asp:RegularExpressionValidator ID="vldHostEmail" runat="server" ControlToValidate="txtEmail" ValidationGroup="HostAdministration" Text="*" ValidationExpression="^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$" ErrorMessage="Email address is not valid" Display="Dynamic" />
Modified: trunk/SubtextSolution/Subtext.Web/Install/Style/InstallationStyle.css
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Install/Style/InstallationStyle.css 2009-03-13 03:35:06 UTC (rev 3406)
+++ trunk/SubtextSolution/Subtext.Web/Install/Style/InstallationStyle.css 2009-03-13 03:49:52 UTC (rev 3407)
@@ -193,4 +193,9 @@
.clear
{
clear: both;
+}
+
+.note {
+ color: #777;
+ font-style: italic;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 03:35:23
|
Revision: 3406
http://subtext.svn.sourceforge.net/subtext/?rev=3406&view=rev
Author: haacked
Date: 2009-03-13 03:35:06 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Added comment to make this easier to use with Gmail
Modified Paths:
--------------
trunk/SubtextSolution/Subtext.Web/Web.config
Modified: trunk/SubtextSolution/Subtext.Web/Web.config
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Web.config 2009-03-13 03:32:19 UTC (rev 3405)
+++ trunk/SubtextSolution/Subtext.Web/Web.config 2009-03-13 03:35:06 UTC (rev 3406)
@@ -112,9 +112,13 @@
attributes to these providers.
- Note: If you use GMail as your SMTP server, remember to use port 587 instead of 465.
+ Note: If you use GMail as your SMTP server, remember to use port 587 instead of 465 and sslEnabled = true
-->
- <add name="SystemMailProvider" type="Subtext.Framework.Email.SystemMailProvider, Subtext.Framework" smtpServer="" username="" password="" adminEmail="ad...@Th..."/>
+ <add name="SystemMailProvider" type="Subtext.Framework.Email.SystemMailProvider, Subtext.Framework"
+ smtpServer=""
+ username=""
+ password=""
+ adminEmail="ad...@Th..."/>
</providers>
</Email>
<BlogMLProvider defaultProvider="SubtextBlogMLProvider">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2009-03-13 03:32:34
|
Revision: 3405
http://subtext.svn.sourceforge.net/subtext/?rev=3405&view=rev
Author: haacked
Date: 2009-03-13 03:32:19 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
Implemented ForgotPassword. Need to merge this change into Release2.1 branch and re-release it as 2.1.1.
Modified Paths:
--------------
trunk/SubtextSolution/Subtext.Framework/Routing/UrlHelper.cs
trunk/SubtextSolution/Subtext.Framework/Web/HttpModules/BlogRequest.cs
trunk/SubtextSolution/Subtext.Web/ForgotPassword.aspx.designer.cs
trunk/SubtextSolution/Subtext.Web/Global.asax.cs
trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master
trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs
trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.designer.cs
trunk/SubtextSolution/Subtext.Web/Skins/_System/SystemStyle.css
trunk/SubtextSolution/Subtext.Web/login.aspx
trunk/SubtextSolution/Subtext.Web/login.aspx.designer.cs
Modified: trunk/SubtextSolution/Subtext.Framework/Routing/UrlHelper.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Framework/Routing/UrlHelper.cs 2009-03-12 12:23:20 UTC (rev 3404)
+++ trunk/SubtextSolution/Subtext.Framework/Routing/UrlHelper.cs 2009-03-13 03:32:19 UTC (rev 3405)
@@ -123,7 +123,7 @@
public virtual VirtualPath BlogUrl() {
string vp = GetVirtualPath("root", new {});
- if (!vp.EndsWith("/")) {
+ if (!(vp ?? string.Empty).EndsWith("/")) {
vp += "/";
}
return vp;
@@ -132,8 +132,7 @@
public virtual VirtualPath BlogUrl(Blog blog)
{
string vp = GetVirtualPath("root", new { subfolder = blog.Subfolder });
- if (!vp.EndsWith("/"))
- {
+ if (!(vp ?? string.Empty).EndsWith("/")) {
vp += "/";
}
return vp;
Modified: trunk/SubtextSolution/Subtext.Framework/Web/HttpModules/BlogRequest.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Framework/Web/HttpModules/BlogRequest.cs 2009-03-12 12:23:20 UTC (rev 3404)
+++ trunk/SubtextSolution/Subtext.Framework/Web/HttpModules/BlogRequest.cs 2009-03-13 03:32:19 UTC (rev 3405)
@@ -92,6 +92,9 @@
if (IsLogin(request)) {
return RequestLocation.LoginPage;
}
+ if (IsForgotPassword(request)) {
+ return RequestLocation.LoginPage;
+ }
if (IsSystemMessage(request)) {
return RequestLocation.SystemMessages;
}
@@ -150,6 +153,11 @@
return (request.Path ?? string.Empty).EndsWith("Login.aspx", StringComparison.OrdinalIgnoreCase);
}
+ private static bool IsForgotPassword(HttpRequestBase request)
+ {
+ return (request.Path ?? string.Empty).EndsWith("ForgotPassword.aspx", StringComparison.OrdinalIgnoreCase);
+ }
+
private static bool IsSystemMessage(HttpRequestBase request) {
return IsInSpecialDirectory(request, "SystemMessages");
}
Modified: trunk/SubtextSolution/Subtext.Web/ForgotPassword.aspx.designer.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/ForgotPassword.aspx.designer.cs 2009-03-12 12:23:20 UTC (rev 3404)
+++ trunk/SubtextSolution/Subtext.Web/ForgotPassword.aspx.designer.cs 2009-03-13 03:32:19 UTC (rev 3405)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
+// Runtime Version:2.0.50727.3074
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -10,7 +10,15 @@
namespace Subtext.Web {
+
public partial class ForgotPassword {
+
+ /// <summary>
+ /// Master property.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated property.
+ /// </remarks>
public new Subtext.Web.Skins._System.ForgotPassword Master {
get {
return ((Subtext.Web.Skins._System.ForgotPassword)(base.Master));
Modified: trunk/SubtextSolution/Subtext.Web/Global.asax.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Global.asax.cs 2009-03-12 12:23:20 UTC (rev 3404)
+++ trunk/SubtextSolution/Subtext.Web/Global.asax.cs 2009-03-13 03:32:19 UTC (rev 3405)
@@ -50,6 +50,7 @@
routes.Ignore("SystemMessages/{*pathinfo}");
//TODO: Consider making this a single route with a constraint of the allowed pages.
+ routes.MapPage("forgotpassword");
routes.MapPage("login");
routes.MapPage("logout");
Modified: trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master 2009-03-12 12:23:20 UTC (rev 3404)
+++ trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master 2009-03-13 03:32:19 UTC (rev 3405)
@@ -17,52 +17,33 @@
<asp:ContentPlaceHolder ID="instructionsPlaceholder" runat="server">
</asp:ContentPlaceHolder>
- <asp:PasswordRecovery ID="passwordRecovery" runat="server"
- MembershipProvider="SubtextMembershipProvider">
-
- <UserNameTemplate>
- <fieldset>
- <legend>Step 1</legend>
- <p>
- We cannot retrieve your password, but we can
- reset it and send you a new one.
- </p>
-
- <span class="error"><asp:literal runat="server" id="FailureText" /></span>
-
- <asp:Label ID="lblUsername" runat="Server" AssociatedControlID="UserName">Username</asp:Label>
- <asp:TextBox ID="UserName" runat="server" CssClass="textbox" ValidationGroup="ResetPassword" />
- <asp:requiredfieldvalidator runat="server"
- controltovalidate="UserName"
- errormessage="User Name Required"
- ValidationGroup="ResetPassword"
- id="UserNameRequired">
- *
- </asp:requiredfieldvalidator>
-
- <asp:Button ID="btnSubmitUsername" runat="server" CommandName="Submit" Text="Continue" ValidationGroup="ResetPassword" CssClass="button" />
- </fieldset>
- </UserNameTemplate>
+ <fieldset>
+ <legend>Reset Password</legend>
- <QuestionTemplate>
- <p class="salutation">Hello <asp:literal runat="server" id="UserName" />!</p>
- <p>To finish resetting your password, please answer the following question.</p>
- <span class="error"><asp:literal runat="server" id="FailureText" /></span>
- <fieldset>
- <legend>Password Reset Question</legend>
- <asp:Label ID="lblQuestion" runat="Server" AssociatedControlID="Answer"><asp:literal runat="server" id="Question" /></asp:Label>
- <asp:TextBox ID="Answer" runat="server" CssClass="textbox" ValidationGroup="ResetPassword" />
- <asp:requiredfieldvalidator runat="server" controltovalidate="Answer" errormessage="Answer." id="AnswerRequired" ValidationGroup="ResetPassword">*</asp:requiredfieldvalidator>
- <asp:Button ID="btnSubmitAnswer" runat="server" CommandName="Submit" Text="Reset" ValidationGroup="ResetPassword" CssClass="button" />
- </fieldset>
- </QuestionTemplate>
+ <asp:PlaceHolder ID="defaultInstructions" runat="server">
+ We cannot retrieve your password, but we can
+ reset it and send you a new one.
+ </asp:PlaceHolder>
- <SuccessTemplate>
- <p class="salutation">
- Your new password has been sent to you.
- Be sure to login and change it immediately.
- </p>
- </SuccessTemplate>
+ <span class="success"><asp:literal runat="server" id="Message" /></span>
+ <span class="error"><asp:literal runat="server" id="FailureText" /></span>
+ <asp:PlaceHolder ID="ResetForm" runat="server">
+ <asp:Label ID="lblUsername" runat="Server" AssociatedControlID="usernameTextBox">Username</asp:Label>
+ <asp:TextBox ID="usernameTextBox" runat="server" CssClass="textbox" />
+ <asp:requiredfieldvalidator runat="server"
+ controltovalidate="usernameTextBox"
+ errormessage="User Name Required"
+ id="UserNameRequired">
+ *
+ </asp:requiredfieldvalidator>
+ <asp:Label ID="lblEmail" runat="Server" AssociatedControlID="emailTextBox">Email</asp:Label>
+ <asp:TextBox ID="emailTextBox" runat="server" CssClass="textbox" />
+
+ <asp:Button ID="btnSubmitUsername" runat="server" OnClick="OnForgotButtonClick" Text="Continue" ValidationGroup="ResetPassword" CssClass="button" />
+ </asp:PlaceHolder>
+ </fieldset>
+
+
</asp:PasswordRecovery>
</div>
</form>
Modified: trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs 2009-03-12 12:23:20 UTC (rev 3404)
+++ trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.cs 2009-03-13 03:32:19 UTC (rev 3405)
@@ -1,8 +1,48 @@
using System;
+using Subtext.Extensibility.Providers;
+using Subtext.Framework;
+using Subtext.Framework.Configuration;
+using Subtext.Framework.Security;
namespace Subtext.Web.Skins._System
{
public partial class ForgotPassword : System.Web.UI.MasterPage
{
+ protected override void OnLoad(EventArgs e)
+ {
+ if (Config.CurrentBlog == null) {
+ ResetForm.Visible = defaultInstructions.Visible = false;
+ FailureText.Text = "Sorry, but forgot password does not work for Host admins. Please read <a href=\"http://subtextproject.com/Home/FAQ/tabid/113/Default.aspx\" title=\"Subtext FAQ\">the FAQ</a> to reset your password.";
+ }
+ base.OnLoad(e);
+ }
+
+ protected void OnForgotButtonClick(object sender, EventArgs args) {
+ Blog currentBlog = Config.CurrentBlog;
+ if (currentBlog == null)
+ {
+ FailureText.Text = "Sorry, but forgot password does not work for Host admins. Please read <a href=\"http://subtextproject.com/Home/FAQ/tabid/113/Default.aspx\" title=\"Subtext FAQ\">the FAQ</a> to reset your password.";
+ }
+ else
+ {
+ ResetAdminPassword(currentBlog);
+ }
+ }
+
+ private void ResetAdminPassword(Blog currentBlog)
+ {
+ if (String.IsNullOrEmpty(currentBlog.Email) || currentBlog.Email != emailTextBox.Text || currentBlog.UserName != usernameTextBox.Text)
+ {
+ FailureText.Text = "Sorry, but the username and email provided did not match our records";
+ }
+ else
+ {
+ string newPassword = SecurityHelper.ResetPassword();
+ EmailProvider.Instance().Send(currentBlog.Email, currentBlog.Email, "Your new password", "I've been told that you forgot your password. Here it is" +
+ Environment.NewLine + "\t" + newPassword);
+ Message.Text = "Password was reset and sent to your email address.";
+ defaultInstructions.Visible = false;
+ }
+ }
}
}
Modified: trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.designer.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.designer.cs 2009-03-12 12:23:20 UTC (rev 3404)
+++ trunk/SubtextSolution/Subtext.Web/Skins/_System/ForgotPassword.Master.designer.cs 2009-03-13 03:32:19 UTC (rev 3405)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.1434
+// Runtime Version:2.0.50727.3074
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -32,12 +32,93 @@
protected global::System.Web.UI.WebControls.ContentPlaceHolder instructionsPlaceholder;
/// <summary>
- /// passwordRecovery control.
+ /// defaultInstructions control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
- protected global::System.Web.UI.WebControls.PasswordRecovery passwordRecovery;
+ protected global::System.Web.UI.WebControls.PlaceHolder defaultInstructions;
+
+ /// <summary>
+ /// Message control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Literal Message;
+
+ /// <summary>
+ /// FailureText control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Literal FailureText;
+
+ /// <summary>
+ /// ResetForm control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.PlaceHolder ResetForm;
+
+ /// <summary>
+ /// lblUsername control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Label lblUsername;
+
+ /// <summary>
+ /// usernameTextBox control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.TextBox usernameTextBox;
+
+ /// <summary>
+ /// UserNameRequired control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.RequiredFieldValidator UserNameRequired;
+
+ /// <summary>
+ /// lblEmail control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Label lblEmail;
+
+ /// <summary>
+ /// emailTextBox control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.TextBox emailTextBox;
+
+ /// <summary>
+ /// btnSubmitUsername control.
+ /// </summary>
+ /// <remarks>
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btnSubmitUsername;
}
}
Modified: trunk/SubtextSolution/Subtext.Web/Skins/_System/SystemStyle.css
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Skins/_System/SystemStyle.css 2009-03-12 12:23:20 UTC (rev 3404)
+++ trunk/SubtextSolution/Subtext.Web/Skins/_System/SystemStyle.css 2009-03-13 03:32:19 UTC (rev 3405)
@@ -131,6 +131,11 @@
color: #c00;
}
+.success {
+ font-weight: bold;
+ color: #0c0;
+}
+
p.Small
{
margin-top: 12px;
Modified: trunk/SubtextSolution/Subtext.Web/login.aspx
===================================================================
--- trunk/SubtextSolution/Subtext.Web/login.aspx 2009-03-12 12:23:20 UTC (rev 3404)
+++ trunk/SubtextSolution/Subtext.Web/login.aspx 2009-03-13 03:32:19 UTC (rev 3405)
@@ -29,10 +29,11 @@
<asp:CheckBox ID="chkRememberMe" runat="server" Text="Remember me" TabIndex="3" CssClass="rememberMe" />
<asp:Button id="btnLogin" runat="server" Text="Login" CssClass="button" onclick="btnLogin_Click" TabIndex="4" />
-
+ <% if (Config.CurrentBlog != null) { %>
<p class="forgotPassword">
<a href="ForgotPassword.aspx" title="Click to reset your password" tabindex="5">Forgot Your Password?</a>
</p>
+ <% } %>
</fieldset>
<fieldset>
Modified: trunk/SubtextSolution/Subtext.Web/login.aspx.designer.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/login.aspx.designer.cs 2009-03-12 12:23:20 UTC (rev 3404)
+++ trunk/SubtextSolution/Subtext.Web/login.aspx.designer.cs 2009-03-13 03:32:19 UTC (rev 3405)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3053
+// Runtime Version:2.0.50727.3074
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <si...@us...> - 2009-03-12 12:23:35
|
Revision: 3404
http://subtext.svn.sourceforge.net/subtext/?rev=3404&view=rev
Author: simo
Date: 2009-03-12 12:23:20 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
Changed my mind... I just copied the fix from trunk
Modified Paths:
--------------
branches/Release2.1/SubtextSolution/Subtext.Web/Admin/EditCategories.aspx.cs
branches/Release2.1/SubtextSolution/Subtext.Web/Admin/WebUI/AdminPage.cs
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Admin/EditCategories.aspx.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Admin/EditCategories.aspx.cs 2009-03-12 12:20:30 UTC (rev 3403)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Admin/EditCategories.aspx.cs 2009-03-12 12:23:20 UTC (rev 3404)
@@ -176,7 +176,6 @@
private void dgrCategories_EditCommand(object source, DataGridCommandEventArgs e)
{
- BindLocalUI();
dgrItems.EditItemIndex = e.Item.ItemIndex;
BindList();
this.Messages.Clear();
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Admin/WebUI/AdminPage.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Admin/WebUI/AdminPage.cs 2009-03-12 12:20:30 UTC (rev 3403)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Admin/WebUI/AdminPage.cs 2009-03-12 12:23:20 UTC (rev 3404)
@@ -60,7 +60,7 @@
protected override void OnPreRender(EventArgs e)
{
- if(this.body != null)
+ if (this.body != null && !String.IsNullOrEmpty(this.TabSectionId))
{
ControlHelper.AddCssClass(this.body, this.TabSectionId);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <si...@us...> - 2009-03-12 12:20:54
|
Revision: 3403
http://subtext.svn.sourceforge.net/subtext/?rev=3403&view=rev
Author: simo
Date: 2009-03-12 12:20:30 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
Fixed the bug that made editing categories impossible (trunk works fine, tho)
Modified Paths:
--------------
branches/Release2.1/SubtextSolution/Subtext.Web/Admin/EditCategories.aspx.cs
Modified: branches/Release2.1/SubtextSolution/Subtext.Web/Admin/EditCategories.aspx.cs
===================================================================
--- branches/Release2.1/SubtextSolution/Subtext.Web/Admin/EditCategories.aspx.cs 2009-03-12 10:49:30 UTC (rev 3402)
+++ branches/Release2.1/SubtextSolution/Subtext.Web/Admin/EditCategories.aspx.cs 2009-03-12 12:20:30 UTC (rev 3403)
@@ -176,6 +176,7 @@
private void dgrCategories_EditCommand(object source, DataGridCommandEventArgs e)
{
+ BindLocalUI();
dgrItems.EditItemIndex = e.Item.ItemIndex;
BindList();
this.Messages.Clear();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <si...@us...> - 2009-03-12 10:49:47
|
Revision: 3402
http://subtext.svn.sourceforge.net/subtext/?rev=3402&view=rev
Author: simo
Date: 2009-03-12 10:49:30 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
Fixed a wrong url in the "All categories" link (it always went to EditLinks even when showing list of posts)
Modified Paths:
--------------
trunk/SubtextSolution/Subtext.Web/Admin/UserControls/CategoryLinkList.ascx.cs
Modified: trunk/SubtextSolution/Subtext.Web/Admin/UserControls/CategoryLinkList.ascx.cs
===================================================================
--- trunk/SubtextSolution/Subtext.Web/Admin/UserControls/CategoryLinkList.ascx.cs 2009-03-10 06:02:29 UTC (rev 3401)
+++ trunk/SubtextSolution/Subtext.Web/Admin/UserControls/CategoryLinkList.ascx.cs 2009-03-12 10:49:30 UTC (rev 3402)
@@ -42,10 +42,14 @@
baseUrl = "EditGalleries.aspx";
this.categoryLinks.Add(new LinkCategoryLink("All Galleries", "EditGalleries.aspx"));
}
- else
+ else if (this.CategoryType == CategoryType.LinkCollection)
{
this.categoryLinks.Add(new LinkCategoryLink("All Categories", "EditLinks.aspx"));
}
+ else if (this.CategoryType == CategoryType.PostCollection)
+ {
+ this.categoryLinks.Add(new LinkCategoryLink("All Categories", "Default.aspx"));
+ }
if (this.CategoryType != CategoryType.None)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
5 messages has been excluded from this view by a project administrator.
