From c5983c0440913cd67f3744c7dda3c3bfc7eee0ed Mon Sep 17 00:00:00 2001 From: xue <> Date: Mon, 1 May 2006 15:40:31 +0000 Subject: Merge from 3.0 branch till 1004. --- .gitattributes | 1 + HISTORY | 2 +- .../phing/tasks/BuildPradoPEARPackageTask.php | 6 +- framework/3rdParty/readme.html | 69 +++++++++++++++++++++- framework/I18N/core/data/license.txt | 35 +++++++++++ framework/Web/Javascripts/js/prado.js | 4 +- framework/Web/Javascripts/prado/element.js | 4 +- framework/Web/THttpRequest.php | 34 ++++++++--- framework/Web/UI/TTemplateManager.php | 2 +- framework/Web/UI/WebControls/TBaseValidator.php | 11 ++-- .../Web/UI/WebControls/TValidationSummary.php | 6 +- .../features/protected/pages/ValidatorEffects.page | 18 +++--- 12 files changed, 157 insertions(+), 35 deletions(-) create mode 100644 framework/I18N/core/data/license.txt diff --git a/.gitattributes b/.gitattributes index ea8660ec..a9170941 100644 --- a/.gitattributes +++ b/.gitattributes @@ -719,6 +719,7 @@ framework/I18N/core/data/kok.dat -text framework/I18N/core/data/kok_IN.dat -text framework/I18N/core/data/kw.dat -text framework/I18N/core/data/kw_GB.dat -text +framework/I18N/core/data/license.txt -text framework/I18N/core/data/lt.dat -text framework/I18N/core/data/lt_LT.dat -text framework/I18N/core/data/lv.dat -text diff --git a/HISTORY b/HISTORY index b240e13e..6211df23 100644 --- a/HISTORY +++ b/HISTORY @@ -25,7 +25,7 @@ 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: Custom visual effects can be added to client-side validators via ClientSide property in validators. (Wei) ENH: TJavascript::encode() allows raw javascript code when string begins with "javascript:" (Wei) ENH: Update TinyMCE to 2.0.5.1 CHG: Rewrote client-side javascript validators, check your client-side validation behaviour (Wei) diff --git a/buildscripts/phing/tasks/BuildPradoPEARPackageTask.php b/buildscripts/phing/tasks/BuildPradoPEARPackageTask.php index 0e764146..72ad8798 100644 --- a/buildscripts/phing/tasks/BuildPradoPEARPackageTask.php +++ b/buildscripts/phing/tasks/BuildPradoPEARPackageTask.php @@ -124,9 +124,9 @@ o Team Integration - PRADO enables separation of content and presentation. Compo $package->addMaintainer('lead', 'knut', 'Knut Urdalen', 'knut.urdalen@gmail.com'); // "core" dependencies - $package->setPhpDep('5.0.0'); - $package->setPearinstallerDep('1.4.0'); - + $package->setPhpDep('5.0.4'); + $package->setPearinstallerDep('1.4.7'); + $package->generateContents(); $e = $package->writePackageFile(); diff --git a/framework/3rdParty/readme.html b/framework/3rdParty/readme.html index c81d263e..b48f5b74 100644 --- a/framework/3rdParty/readme.html +++ b/framework/3rdParty/readme.html @@ -45,10 +45,77 @@ projects.