From ddfafaac2c1f18aca0fda3b4157acd935b9ac9a2 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 30 Apr 2006 12:51:23 +0000
Subject: merge from 3.0 branch till 995.

---
 HISTORY | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'HISTORY')

diff --git a/HISTORY b/HISTORY
index 4c9e96ee..b240e13e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,7 +2,6 @@ Version 3.1.0 To be released
 ============================
 NEW: TOutputCache (Qiang)
 NEW: TQueue (Qiang)
-NEW: TPageStateFormatter (Qiang)
 NEW: TSessionPageStatePersister (Qiang)
 NEW: SQLMap (Wei)
 
@@ -25,6 +24,7 @@ ENH: TButtonColumn can now be a column of image buttons (Qiang)
 ENH: TLiteral will display body content if Text is empty (Qiang)
 ENH: Format string in classes extending TDataGridColumn can now evaluate an expression (Qiang)
 ENH: Format string in classes extending TListControl can now evaluate an expression (Qiang)
+ENH: Added THttpResponse::reload() (Qiang)
 ENH: Custom visual effects can be added to client-side validators. (Wei)
 ENH: TJavascript::encode() allows raw javascript code when string begins with "javascript:" (Wei)
 ENH: Update TinyMCE to 2.0.5.1
@@ -33,6 +33,8 @@ CHG: Updated the javascript Prototype library, a few utilties functions REMOVED,
 CHG: Build javascript without compression, only comments are removed. (Wei)
 CHG: TDatePicker's date can be set using Date property, it value must be in same format as DateFormat, TimeStamp must be set as integer (wei)
 CHG: TSimpleDateFormatter::parse() now return an integer or null on parse error (Wei)
+CHG: TControl::createControls() is changed to public. (Qiang)
+CHG: Template comment tag is changed from <! ... !> to <!-- ... --!> (Qiang)
 NEW: TListControlValidator (Wei)
 NEW: TClientScript (Wei)
 
-- 
cgit v1.2.3