merge from 3.0 branch till 978.

1 files changed, 12 insertions, 2 deletions

diff --git a/.gitattributes b/.gitattributes
index 4af4a3fe..fc04fe48 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,6 +11,7 @@ buildscripts/phing/style/log.xsl -text
 buildscripts/phing/style/phpunit2-frames.xsl -text
 buildscripts/phing/style/phpunit2-noframes.xsl -text
 buildscripts/phing/style/str.replace.function.xsl -text
+buildscripts/phing/tasks/BuildPradoPEARPackageTask.php -text
 buildscripts/phing/tasks/PhpLintTask.php -text
 buildscripts/phing/tasks/XmlLintTask.php -text
 buildscripts/phing/tasks/ZendCodeAnalyzerTask.php -text
@@ -883,9 +884,7 @@ framework/Web/Javascripts/prado/controls.js -text
 framework/Web/Javascripts/prado/element.js -text
 framework/Web/Javascripts/prado/form.js -text
 framework/Web/Javascripts/prado/prado.js -text
-framework/Web/Javascripts/prado/validation.js -text
 framework/Web/Javascripts/prado/validation3.js -text
-framework/Web/Javascripts/prado/validators.js -text
 framework/Web/Javascripts/prototype/AUTHORS -text
 framework/Web/Javascripts/prototype/LICENSE -text
 framework/Web/Javascripts/prototype/README -text
@@ -945,6 +944,7 @@ framework/Web/UI/WebControls/TButtonColumn.php -text
 framework/Web/UI/WebControls/TCheckBox.php -text
 framework/Web/UI/WebControls/TCheckBoxColumn.php -text
 framework/Web/UI/WebControls/TCheckBoxList.php -text
+framework/Web/UI/WebControls/TClientScript.php -text
 framework/Web/UI/WebControls/TColorPicker.php -text
 framework/Web/UI/WebControls/TCompareValidator.php -text
 framework/Web/UI/WebControls/TContent.php -text
@@ -1034,6 +1034,7 @@ tests/FunctionalTests/features/protected/pages/I18N/Home.page -text
 tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page -text
 tests/FunctionalTests/features/protected/pages/I18N/config.xml -text
 tests/FunctionalTests/features/protected/pages/RatingList.page -text
+tests/FunctionalTests/features/protected/pages/ValidatorEffects.page -text
 tests/FunctionalTests/index.php -text
 tests/FunctionalTests/quickstart.php -text
 tests/FunctionalTests/quickstart/Advanced/I18N.php -text
@@ -1050,20 +1051,29 @@ tests/FunctionalTests/quickstart/Controls/DataGrid6TestCase.php -text
 tests/FunctionalTests/quickstart/Controls/DataList1TestCase.php -text
 tests/FunctionalTests/quickstart/Controls/DataList2TestCase.php -text
 tests/FunctionalTests/quickstart/Controls/DropDownListTestCase.php -text
+tests/FunctionalTests/quickstart/Controls/ExpressionTestCase.php -text
+tests/FunctionalTests/quickstart/Controls/HtmlAreaTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/HyperLinkTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/ImageButtonTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/ImageTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/LabelTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/LinkButtonTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/ListBoxTestCase.php -text
+tests/FunctionalTests/quickstart/Controls/MultiViewTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/PanelTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/RadioButtonListTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/RadioButtonTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/Repeater1TestCase.php -text
 tests/FunctionalTests/quickstart/Controls/Repeater2TestCase.php -text
 tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php -text
+tests/FunctionalTests/quickstart/Controls/StatementsTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/TableTestCase.php -text
 tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php -text
+tests/FunctionalTests/quickstart/Controls/Wizard1TestCase.php -text
+tests/FunctionalTests/quickstart/Controls/Wizard2TestCase.php -text
+tests/FunctionalTests/quickstart/Controls/Wizard3TestCase.php -text
+tests/FunctionalTests/quickstart/Controls/Wizard4TestCase.php -text
+tests/FunctionalTests/quickstart/Controls/Wizard5TestCase.php -text
 tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php -text
 tests/FunctionalTests/selenium/SeleneseRunner.html -text
 tests/FunctionalTests/selenium/SeleniumLog.html -text