From e392ecbf6e422825083bc7204eacb7090619a47c Mon Sep 17 00:00:00 2001 From: xue <> Date: Fri, 21 Apr 2006 12:36:06 +0000 Subject: Merge from 3.0 branch till 953. --- .gitattributes | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index e4bfdf73..09a257fd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,8 +5,6 @@ /build.xml -text buildscripts/.htaccess -text buildscripts/jsbuilder/build.php -text -buildscripts/jsbuilder/custom_rhino.jar -text -buildscripts/jsbuilder/packer.js -text buildscripts/phing/style/coverage-frames.xsl -text buildscripts/phing/style/log.xsl -text buildscripts/phing/style/phpunit2-frames.xsl -text @@ -863,10 +861,8 @@ framework/Web/Javascripts/effects/slider.js -text framework/Web/Javascripts/extended/base.js -text framework/Web/Javascripts/extended/builder.js -text framework/Web/Javascripts/extended/date.js -text -framework/Web/Javascripts/extended/dom.js -text framework/Web/Javascripts/extended/event.js -text framework/Web/Javascripts/extended/string.js -text -framework/Web/Javascripts/extended/util.js -text framework/Web/Javascripts/extra/behaviour.js -text framework/Web/Javascripts/extra/getElementsBySelector.js -text framework/Web/Javascripts/extra/json.js -text @@ -887,6 +883,7 @@ 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 @@ -903,6 +900,7 @@ framework/Web/Javascripts/prototype/hash.js -text framework/Web/Javascripts/prototype/position.js -text framework/Web/Javascripts/prototype/prototype.js -text framework/Web/Javascripts/prototype/range.js -text +framework/Web/Javascripts/prototype/selector.js -text framework/Web/Javascripts/prototype/string.js -text framework/Web/Javascripts/ratings/blocks.css -text framework/Web/Javascripts/ratings/blocks.png -text @@ -1156,19 +1154,38 @@ tests/FunctionalTests/validators.php -text tests/FunctionalTests/validators/index.php -text tests/FunctionalTests/validators/protected/pages/Button.page -text tests/FunctionalTests/validators/protected/pages/Button.php -text +tests/FunctionalTests/validators/protected/pages/CausesValidation.page -text tests/FunctionalTests/validators/protected/pages/CheckBox.page -text tests/FunctionalTests/validators/protected/pages/CheckBox.php -text +tests/FunctionalTests/validators/protected/pages/CompareValidator.page -text +tests/FunctionalTests/validators/protected/pages/CustomValidator.page -text +tests/FunctionalTests/validators/protected/pages/CustomValidator.php -text tests/FunctionalTests/validators/protected/pages/ImageButton.page -text tests/FunctionalTests/validators/protected/pages/ImageButton.php -text tests/FunctionalTests/validators/protected/pages/Layout.php -text tests/FunctionalTests/validators/protected/pages/Layout.tpl -text tests/FunctionalTests/validators/protected/pages/LinkButton.page -text tests/FunctionalTests/validators/protected/pages/LinkButton.php -text +tests/FunctionalTests/validators/protected/pages/RangeValidatorDate.page -text +tests/FunctionalTests/validators/protected/pages/RangeValidatorFloat.page -text +tests/FunctionalTests/validators/protected/pages/RangeValidatorInteger.page -text +tests/FunctionalTests/validators/protected/pages/RangeValidatorString.page -text +tests/FunctionalTests/validators/protected/pages/RegularExpressionValidator.page -text +tests/FunctionalTests/validators/protected/pages/RequiredFieldValidator.page -text +tests/FunctionalTests/validators/protected/pages/RequiredListValidator.page -text +tests/FunctionalTests/validators/protected/pages/ValidationSummary.page -text tests/FunctionalTests/validators/protected/pages/config.xml -text tests/FunctionalTests/validators/tests/ButtonTestCase.php -text tests/FunctionalTests/validators/tests/CheckBoxTestCase.php -text +tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php -text +tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php -text tests/FunctionalTests/validators/tests/ImageButtonTestCase.php -text tests/FunctionalTests/validators/tests/LinkButtonTestCase.php -text +tests/FunctionalTests/validators/tests/RangeValidatorTestCase.php -text +tests/FunctionalTests/validators/tests/RegExpValidatorTestCase.php -text +tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php -text +tests/FunctionalTests/validators/tests/RequiredListTestCase.php -text +tests/FunctionalTests/validators/tests/ValidationSummaryTestCase.php -text tests/UnitTests/TODO.txt -text tests/UnitTests/framework/Collections/utList.php -text tests/UnitTests/framework/Collections/utMap.php -text -- cgit v1.2.3