Merge from 3.0 branch till 1099.

1 files changed, 80 insertions, 0 deletions

diff --git a/.gitattributes b/.gitattributes
index 93ce7505..6b709dfd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -24,6 +24,67 @@ buildscripts/setup.php -text
 buildscripts/texbuilder/build.php -text
 buildscripts/texbuilder/pages.php -text
 buildscripts/texbuilder/prado3_quick_start.tex -text
+demos/blog/index.php -text
+demos/blog/protected/Common/BlogDataModule.php -text
+demos/blog/protected/Common/BlogErrors.php -text
+demos/blog/protected/Common/BlogException.php -text
+demos/blog/protected/Common/BlogPage.php -text
+demos/blog/protected/Common/BlogUser.php -text
+demos/blog/protected/Common/BlogUserManager.php -text
+demos/blog/protected/Common/XListMenu.php -text
+demos/blog/protected/Common/messages.txt -text
+demos/blog/protected/Common/schema.sql -text
+demos/blog/protected/Data/Options.xml -text
+demos/blog/protected/Layouts/MainLayout.php -text
+demos/blog/protected/Layouts/MainLayout.tpl -text
+demos/blog/protected/Pages/Admin/AdminMenu.php -text
+demos/blog/protected/Pages/Admin/AdminMenu.tpl -text
+demos/blog/protected/Pages/Admin/ConfigMan.page -text
+demos/blog/protected/Pages/Admin/ConfigMan.php -text
+demos/blog/protected/Pages/Admin/PostMan.page -text
+demos/blog/protected/Pages/Admin/PostMan.php -text
+demos/blog/protected/Pages/Admin/Settings.page -text
+demos/blog/protected/Pages/Admin/UserMan.page -text
+demos/blog/protected/Pages/Admin/UserMan.php -text
+demos/blog/protected/Pages/Admin/config.xml -text
+demos/blog/protected/Pages/ErrorReport.page -text
+demos/blog/protected/Pages/ErrorReport.php -text
+demos/blog/protected/Pages/Posts/EditCategory.page -text
+demos/blog/protected/Pages/Posts/EditCategory.php -text
+demos/blog/protected/Pages/Posts/EditPost.page -text
+demos/blog/protected/Pages/Posts/EditPost.php -text
+demos/blog/protected/Pages/Posts/ListPost.page -text
+demos/blog/protected/Pages/Posts/ListPost.php -text
+demos/blog/protected/Pages/Posts/MyPost.page -text
+demos/blog/protected/Pages/Posts/MyPost.php -text
+demos/blog/protected/Pages/Posts/NewCategory.page -text
+demos/blog/protected/Pages/Posts/NewCategory.php -text
+demos/blog/protected/Pages/Posts/NewPost.page -text
+demos/blog/protected/Pages/Posts/NewPost.php -text
+demos/blog/protected/Pages/Posts/ViewPost.page -text
+demos/blog/protected/Pages/Posts/ViewPost.php -text
+demos/blog/protected/Pages/Posts/config.xml -text
+demos/blog/protected/Pages/Users/EditUser.page -text
+demos/blog/protected/Pages/Users/EditUser.php -text
+demos/blog/protected/Pages/Users/NewUser.page -text
+demos/blog/protected/Pages/Users/NewUser.php -text
+demos/blog/protected/Pages/Users/ViewUser.page -text
+demos/blog/protected/Pages/Users/ViewUser.php -text
+demos/blog/protected/Pages/Users/config.xml -text
+demos/blog/protected/Portlets/AccountPortlet.php -text
+demos/blog/protected/Portlets/AccountPortlet.tpl -text
+demos/blog/protected/Portlets/ArchivePortlet.php -text
+demos/blog/protected/Portlets/ArchivePortlet.tpl -text
+demos/blog/protected/Portlets/CategoryPortlet.php -text
+demos/blog/protected/Portlets/CategoryPortlet.tpl -text
+demos/blog/protected/Portlets/LoginPortlet.php -text
+demos/blog/protected/Portlets/LoginPortlet.tpl -text
+demos/blog/protected/Portlets/Portlet.php -text
+demos/blog/protected/Portlets/SearchPortlet.php -text
+demos/blog/protected/Portlets/SearchPortlet.tpl -text
+demos/blog/protected/application.xml -text
+demos/blog/sitemap.txt -text
+demos/blog/themes/Basic/style.css -text
 demos/composer/index.php -text
 demos/composer/index2.php -text
 demos/composer/protected/pages/ClassDefinition.php -text
@@ -863,6 +924,7 @@ 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
@@ -1196,20 +1258,38 @@ tests/FunctionalTests/tickets.php -text
 tests/FunctionalTests/tickets/index.php -text
 tests/FunctionalTests/tickets/protected/pages/Layout.php -text
 tests/FunctionalTests/tickets/protected/pages/Layout.tpl -text
+tests/FunctionalTests/tickets/protected/pages/TestHtmlArea.php -text
+tests/FunctionalTests/tickets/protected/pages/Ticket121.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket121.php -text
+tests/FunctionalTests/tickets/protected/pages/Ticket163.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket169.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket191.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket191.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket21.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket21.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket27.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket28.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket28.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl -text
 tests/FunctionalTests/tickets/protected/pages/Ticket68.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket72.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket72.php -text
+tests/FunctionalTests/tickets/protected/pages/Ticket93.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket93.php -text
 tests/FunctionalTests/tickets/protected/pages/config.xml -text
+tests/FunctionalTests/tickets/protected/pages/hotspot.jpg -text
+tests/FunctionalTests/tickets/tests/Ticket121TestCase.php -text
+tests/FunctionalTests/tickets/tests/Ticket163TestCase.php -text
+tests/FunctionalTests/tickets/tests/Ticket169TestCase.php -text
+tests/FunctionalTests/tickets/tests/Ticket191TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket21TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket27TestCase.php -text
+tests/FunctionalTests/tickets/tests/Ticket28TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket54TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket72TestCase.php -text
+tests/FunctionalTests/tickets/tests/Ticket93TestCase.php -text
 tests/FunctionalTests/validators.php -text
 tests/FunctionalTests/validators/index.php -text
 tests/FunctionalTests/validators/protected/pages/Button.page -text