merge from 3.0 branch till 1133.

1 files changed, 38 insertions, 66 deletions

diff --git a/.gitattributes b/.gitattributes
index 08cd6622..a18d9820 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -130,6 +130,10 @@ demos/quickstart/index.php -text
 demos/quickstart/index2.php -text
 demos/quickstart/protected/.htaccess -text
 demos/quickstart/protected/application.xml -text
+demos/quickstart/protected/comments/CommentList.php -text
+demos/quickstart/protected/comments/CommentList.tpl -text
+demos/quickstart/protected/comments/QuickStartComments.php -text
+demos/quickstart/protected/comments/comments.db -text
 demos/quickstart/protected/controls/DocLink.php -text
 demos/quickstart/protected/controls/Layout.php -text
 demos/quickstart/protected/controls/Layout.tpl -text
@@ -233,6 +237,8 @@ demos/quickstart/protected/pages/Advanced/mastercontent.gif -text
 demos/quickstart/protected/pages/Advanced/mastercontent.vsd -text
 demos/quickstart/protected/pages/Advanced/pcrelation.gif -text
 demos/quickstart/protected/pages/Advanced/pcrelation.vsd -text
+demos/quickstart/protected/pages/Comments.page -text
+demos/quickstart/protected/pages/Comments.php -text
 demos/quickstart/protected/pages/Configurations/AppConfig.page -text
 demos/quickstart/protected/pages/Configurations/Overview.page -text
 demos/quickstart/protected/pages/Configurations/PageConfig.page -text
@@ -476,6 +482,8 @@ docs/sqlmap/latex/tut3.tex -text
 docs/sqlmap/sqlmap.pdf -text
 docs/sqlmap/sqlmap_tut.pdf -text
 framework/.htaccess -text
+framework/3rdParty/Markdown/License.text -text
+framework/3rdParty/Markdown/MarkdownParser.php -text
 framework/3rdParty/SafeHtml/HTMLSax3.php -text
 framework/3rdParty/SafeHtml/HTMLSax3/Decorators.php -text
 framework/3rdParty/SafeHtml/HTMLSax3/States.php -text
@@ -1074,6 +1082,7 @@ framework/Web/UI/WebControls/TListControl.php -text
 framework/Web/UI/WebControls/TListControlValidator.php -text
 framework/Web/UI/WebControls/TListItem.php -text
 framework/Web/UI/WebControls/TLiteral.php -text
+framework/Web/UI/WebControls/TMarkdown.php -text
 framework/Web/UI/WebControls/TMultiView.php -text
 framework/Web/UI/WebControls/TOutputCache.php -text
 framework/Web/UI/WebControls/TPanel.php -text
@@ -1189,76 +1198,39 @@ 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
-tests/FunctionalTests/selenium/TestRunner-splash.html -text
-tests/FunctionalTests/selenium/TestRunner.hta -text
-tests/FunctionalTests/selenium/TestRunner.html -text
-tests/FunctionalTests/selenium/VERSION.txt -text
-tests/FunctionalTests/selenium/build.xml -text
-tests/FunctionalTests/selenium/doc/FAQ.html -text
-tests/FunctionalTests/selenium/doc/FAQ.txt -text
-tests/FunctionalTests/selenium/doc/contact.html -text
-tests/FunctionalTests/selenium/doc/developingdrivers.html -text
-tests/FunctionalTests/selenium/doc/driven.html -text
-tests/FunctionalTests/selenium/doc/home-page.html -text
-tests/FunctionalTests/selenium/doc/images/Adjacent.png -text
-tests/FunctionalTests/selenium/doc/images/Embedded.png -text
-tests/FunctionalTests/selenium/doc/images/SmallAdjacent.png -text
-tests/FunctionalTests/selenium/doc/images/SmallEmbedded.png -text
-tests/FunctionalTests/selenium/doc/images/SmallStandalone.png -text
-tests/FunctionalTests/selenium/doc/images/Standalone.png -text
-tests/FunctionalTests/selenium/doc/images/localhostAut.png -text
-tests/FunctionalTests/selenium/doc/images/localhostDriver.png -text
-tests/FunctionalTests/selenium/doc/images/localhostSelenium.png -text
-tests/FunctionalTests/selenium/doc/images/stockmeister.png -text
-tests/FunctionalTests/selenium/doc/images/tested-with-selenium.png -text
-tests/FunctionalTests/selenium/doc/index.html -text
-tests/FunctionalTests/selenium/doc/jsrmi.html -text
-tests/FunctionalTests/selenium/doc/release-notes.html -text
-tests/FunctionalTests/selenium/doc/rst2html.bat -text
-tests/FunctionalTests/selenium/doc/seleniumReference.html -text
-tests/FunctionalTests/selenium/doc/seleniumReference.txt -text
-tests/FunctionalTests/selenium/doc/testRunner.txt -text
-tests/FunctionalTests/selenium/doc/testrunner.html -text
-tests/FunctionalTests/selenium/doc/usage.html -text
-tests/FunctionalTests/selenium/dom-images/butmin.gif -text
-tests/FunctionalTests/selenium/dom-images/butplus.gif -text
-tests/FunctionalTests/selenium/dom-styles/default.css -text
-tests/FunctionalTests/selenium/domviewer.html -text
-tests/FunctionalTests/selenium/html-xpath/carnation.jpg -text
-tests/FunctionalTests/selenium/html-xpath/example.html -text
-tests/FunctionalTests/selenium/html-xpath/html-xpath-patched.js -text
-tests/FunctionalTests/selenium/html-xpath/html-xpath.js -text
-tests/FunctionalTests/selenium/html-xpath/license.txt -text
-tests/FunctionalTests/selenium/html-xpath/rainbow.jpg -text
-tests/FunctionalTests/selenium/htmlutils.js -text
-tests/FunctionalTests/selenium/index.html -text
-tests/FunctionalTests/selenium/install-readme.txt -text
-tests/FunctionalTests/selenium/jsmock/mock-tests.html -text
-tests/FunctionalTests/selenium/jsmock/mock.js -text
+tests/FunctionalTests/selenium/core/SeleneseRunner.html -text
+tests/FunctionalTests/selenium/core/SeleniumLog.html -text
+tests/FunctionalTests/selenium/core/TestPrompt.html -text
+tests/FunctionalTests/selenium/core/TestRunner-splash.html -text
+tests/FunctionalTests/selenium/core/TestRunner.html -text
+tests/FunctionalTests/selenium/core/domviewer/butmin.gif -text
+tests/FunctionalTests/selenium/core/domviewer/butplus.gif -text
+tests/FunctionalTests/selenium/core/domviewer/domviewer.css -text
+tests/FunctionalTests/selenium/core/domviewer/domviewer.html -text
+tests/FunctionalTests/selenium/core/domviewer/selenium-domviewer.js -text
+tests/FunctionalTests/selenium/core/scripts/find_matching_child.js -text
+tests/FunctionalTests/selenium/core/scripts/htmlutils.js -text
+tests/FunctionalTests/selenium/core/scripts/prototype-1.4.0.js -text
+tests/FunctionalTests/selenium/core/scripts/selenium-api.js -text
+tests/FunctionalTests/selenium/core/scripts/selenium-browserbot.js -text
+tests/FunctionalTests/selenium/core/scripts/selenium-browserdetect.js -text
+tests/FunctionalTests/selenium/core/scripts/selenium-commandhandlers.js -text
+tests/FunctionalTests/selenium/core/scripts/selenium-executionloop.js -text
+tests/FunctionalTests/selenium/core/scripts/selenium-logging.js -text
+tests/FunctionalTests/selenium/core/scripts/selenium-seleneserunner.js -text
+tests/FunctionalTests/selenium/core/scripts/selenium-testrunner.js -text
+tests/FunctionalTests/selenium/core/scripts/selenium-version.js -text
+tests/FunctionalTests/selenium/core/scripts/user-extensions.js.sample -text
+tests/FunctionalTests/selenium/core/scripts/xmlextras.js -text
+tests/FunctionalTests/selenium/core/selenium-logo.png -text
+tests/FunctionalTests/selenium/core/selenium.css -text
+tests/FunctionalTests/selenium/core/xpath/dom.js -text
+tests/FunctionalTests/selenium/core/xpath/misc.js -text
+tests/FunctionalTests/selenium/core/xpath/xpath.js -text
 tests/FunctionalTests/selenium/php/TestRunner.php -text
 tests/FunctionalTests/selenium/php/results.php -text
 tests/FunctionalTests/selenium/php/selenium.php -text
 tests/FunctionalTests/selenium/prado-functional-test.js -text
-tests/FunctionalTests/selenium/readme-selenium-fitrunner.txt -text
-tests/FunctionalTests/selenium/readme-selenium-rpcrunner.txt -text
-tests/FunctionalTests/selenium/selenium-api.js -text
-tests/FunctionalTests/selenium/selenium-browserbot.js -text
-tests/FunctionalTests/selenium/selenium-commandhandlers.js -text
-tests/FunctionalTests/selenium/selenium-domviewer.js -text
-tests/FunctionalTests/selenium/selenium-executionloop.js -text
-tests/FunctionalTests/selenium/selenium-fitrunner.js -text
-tests/FunctionalTests/selenium/selenium-logging.js -text
-tests/FunctionalTests/selenium/selenium-logo.graffle -text
-tests/FunctionalTests/selenium/selenium-logo.png -text
-tests/FunctionalTests/selenium/selenium-seleneserunner.js -text
-tests/FunctionalTests/selenium/selenium-tableparser.js -text
-tests/FunctionalTests/selenium/selenium-testrunner.js -text
-tests/FunctionalTests/selenium/selenium.css -text
-tests/FunctionalTests/selenium/user-extensions.js.sample -text
-tests/FunctionalTests/selenium/xmlextras.js -text
-tests/FunctionalTests/selenium/xpath.js -text
 tests/FunctionalTests/tickets.php -text
 tests/FunctionalTests/tickets/index.php -text
 tests/FunctionalTests/tickets/protected/pages/Layout.php -text