merge from 3.0 branch till 1779.

1 files changed, 38 insertions, 54 deletions

diff --git a/.gitattributes b/.gitattributes
index d001a74e..e16a636d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -356,7 +356,6 @@ buildscripts/index/api_index.php -text
 buildscripts/index/build.php -text
 buildscripts/index/quickstart_index.php -text
 buildscripts/index/search.php -text
-buildscripts/jsbuilder/JavaScript[!!-~]Documentation[!!-~]Tool.html -text
 buildscripts/jsbuilder/build.php -text
 buildscripts/jsbuilder/jsmin.php -text
 buildscripts/phing/CREDITS -text
@@ -1910,36 +1909,6 @@ framework/Util/TSimpleDateFormatter.php -text
 framework/Util/TVarDumper.php -text
 framework/Web/Javascripts/TJSON.php -text
 framework/Web/Javascripts/TJavaScript.php -text
-framework/Web/Javascripts/colorpicker/background.png -text
-framework/Web/Javascripts/colorpicker/button.gif -text
-framework/Web/Javascripts/colorpicker/colorpicker.js -text
-framework/Web/Javascripts/colorpicker/default.css -text
-framework/Web/Javascripts/colorpicker/hue.gif -text
-framework/Web/Javascripts/colorpicker/slider.gif -text
-framework/Web/Javascripts/colorpicker/spacer.gif -text
-framework/Web/Javascripts/colorpicker/target_black.gif -text
-framework/Web/Javascripts/colorpicker/target_white.gif -text
-framework/Web/Javascripts/datepicker/calendar.png -text
-framework/Web/Javascripts/datepicker/datepicker.js -text
-framework/Web/Javascripts/datepicker/default.css -text
-framework/Web/Javascripts/datepicker/spacer.gif -text
-framework/Web/Javascripts/effects/CHANGELOG -text
-framework/Web/Javascripts/effects/MIT-LICENSE -text
-framework/Web/Javascripts/effects/README -text
-framework/Web/Javascripts/effects/builder.js -text
-framework/Web/Javascripts/effects/controls.js -text
-framework/Web/Javascripts/effects/dragdrop.js -text
-framework/Web/Javascripts/effects/effects.js -text
-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/effects.js -text
-framework/Web/Javascripts/extended/event.js -text
-framework/Web/Javascripts/extended/string.js -text
-framework/Web/Javascripts/extra/json.js -text
-framework/Web/Javascripts/extra/logger.js -text
-framework/Web/Javascripts/js/compressed/ajax.js -text
 framework/Web/Javascripts/js/compressed/clientscripts.php -text
 framework/Web/Javascripts/js/compressed/colorpicker.js -text
 framework/Web/Javascripts/js/compressed/containers.js -text
@@ -1947,9 +1916,7 @@ framework/Web/Javascripts/js/compressed/datepicker.js -text
 framework/Web/Javascripts/js/compressed/effects.js -text
 framework/Web/Javascripts/js/compressed/logger.js -text
 framework/Web/Javascripts/js/compressed/prado.js -text
-framework/Web/Javascripts/js/compressed/rico.js -text
 framework/Web/Javascripts/js/compressed/validator.js -text
-framework/Web/Javascripts/js/debug/ajax.js -text
 framework/Web/Javascripts/js/debug/clientscripts.php -text
 framework/Web/Javascripts/js/debug/colorpicker.js -text
 framework/Web/Javascripts/js/debug/containers.js -text
@@ -1957,33 +1924,50 @@ framework/Web/Javascripts/js/debug/datepicker.js -text
 framework/Web/Javascripts/js/debug/effects.js -text
 framework/Web/Javascripts/js/debug/logger.js -text
 framework/Web/Javascripts/js/debug/prado.js -text
-framework/Web/Javascripts/js/debug/rico.js -text
 framework/Web/Javascripts/js/debug/validator.js -text
 framework/Web/Javascripts/prado/activecontrols3.js -text
 framework/Web/Javascripts/prado/ajax3.js -text
-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/colorpicker/background.png -text
+framework/Web/Javascripts/prado/colorpicker/button.gif -text
+framework/Web/Javascripts/prado/colorpicker/colorpicker.js -text
+framework/Web/Javascripts/prado/colorpicker/default.css -text
+framework/Web/Javascripts/prado/colorpicker/hue.gif -text
+framework/Web/Javascripts/prado/colorpicker/slider.gif -text
+framework/Web/Javascripts/prado/colorpicker/spacer.gif -text
+framework/Web/Javascripts/prado/colorpicker/target_black.gif -text
+framework/Web/Javascripts/prado/colorpicker/target_white.gif -text
+framework/Web/Javascripts/prado/controls/controls.js -text
+framework/Web/Javascripts/prado/datepicker/calendar.png -text
+framework/Web/Javascripts/prado/datepicker/datepicker.js -text
+framework/Web/Javascripts/prado/datepicker/default.css -text
+framework/Web/Javascripts/prado/datepicker/spacer.gif -text
 framework/Web/Javascripts/prado/inlineeditor.js -text
+framework/Web/Javascripts/prado/logger/logger.js -text
 framework/Web/Javascripts/prado/prado.js -text
-framework/Web/Javascripts/prado/validation3.js -text
+framework/Web/Javascripts/prado/ratings/blocks.css -text
+framework/Web/Javascripts/prado/ratings/blocks.png -text
+framework/Web/Javascripts/prado/ratings/blocks_blank.gif -text
+framework/Web/Javascripts/prado/ratings/blocks_half.gif -text
+framework/Web/Javascripts/prado/ratings/blocks_hover.gif -text
+framework/Web/Javascripts/prado/ratings/blocks_selected.gif -text
+framework/Web/Javascripts/prado/ratings/default.css -text
+framework/Web/Javascripts/prado/ratings/default_blank.gif -text
+framework/Web/Javascripts/prado/ratings/default_half.gif -text
+framework/Web/Javascripts/prado/ratings/default_hover.gif -text
+framework/Web/Javascripts/prado/ratings/default_selected.gif -text
+framework/Web/Javascripts/prado/ratings/ratings.js -text
+framework/Web/Javascripts/prado/ratings/stars1.png -text
+framework/Web/Javascripts/prado/scriptaculous-adapter.js -text
+framework/Web/Javascripts/prado/validator/validation3.js -text
 framework/Web/Javascripts/prototype/prototype.js -text
-framework/Web/Javascripts/ratings/blocks.css -text
-framework/Web/Javascripts/ratings/blocks.png -text
-framework/Web/Javascripts/ratings/blocks_blank.gif -text
-framework/Web/Javascripts/ratings/blocks_combined.gif -text
-framework/Web/Javascripts/ratings/blocks_half.gif -text
-framework/Web/Javascripts/ratings/blocks_selected.gif -text
-framework/Web/Javascripts/ratings/default.css -text
-framework/Web/Javascripts/ratings/default.png -text
-framework/Web/Javascripts/ratings/default_blank.gif -text
-framework/Web/Javascripts/ratings/default_combined.gif -text
-framework/Web/Javascripts/ratings/default_half.gif -text
-framework/Web/Javascripts/ratings/default_selected.gif -text
-framework/Web/Javascripts/ratings/ratings.js -text
-framework/Web/Javascripts/rico/colors.js -text
-framework/Web/Javascripts/rico/extension.js -text
-framework/Web/Javascripts/rico/rico.js -text
+framework/Web/Javascripts/scriptaculous/CHANGELOG -text
+framework/Web/Javascripts/scriptaculous/MIT-LICENSE -text
+framework/Web/Javascripts/scriptaculous/README -text
+framework/Web/Javascripts/scriptaculous/builder.js -text
+framework/Web/Javascripts/scriptaculous/controls.js -text
+framework/Web/Javascripts/scriptaculous/dragdrop.js -text
+framework/Web/Javascripts/scriptaculous/effects.js -text
+framework/Web/Javascripts/scriptaculous/slider.js -text
 framework/Web/Security/Principal/IIdentity.php -text
 framework/Web/Security/Principal/IPrincipal.php -text
 framework/Web/Security/Principal/TGenericIdentity.php -text