From fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Mon, 6 Jan 2014 22:41:46 +0100
Subject: Happy 2014! (cherry picked from commit
7915cde127eba2a5143fd45c6b32e81ad91bdfae)
Conflicts:
framework/Data/Common/Mssql/TMssqlMetaData.php
framework/Data/Common/Mysql/TMysqlMetaData.php
framework/Data/Common/Oracle/TOracleMetaData.php
framework/Data/Common/Pgsql/TPgsqlMetaData.php
framework/Data/Common/Sqlite/TSqliteMetaData.php
framework/Data/Common/TDbMetaData.php
framework/Web/UI/ActiveControls/TCallbackClientScript.php
framework/Web/UI/JuiControls/TJuiAutoComplete.php
framework/Web/UI/JuiControls/TJuiControlAdapter.php
framework/Web/UI/JuiControls/TJuiDraggable.php
framework/Web/UI/JuiControls/TJuiDroppable.php
framework/Web/UI/JuiControls/TJuiResizable.php
framework/Web/UI/JuiControls/TJuiSelectable.php
framework/Web/UI/JuiControls/TJuiSortable.php
framework/Wsat/TWsatARGenerator.php
framework/Wsat/TWsatService.php
framework/Wsat/pages/TWsatGenerateAR.php
framework/Wsat/pages/TWsatHome.php
framework/Wsat/pages/TWsatLogin.php
framework/Wsat/pages/TWsatScaffolding.php
---
index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'index.html')
diff --git a/index.html b/index.html
index 37a2a60d..4fb55fcf 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
PRADO Framework for PHP 5
Version 3.2.3
-Copyright© 2004-2013 by Prado Software
+Copyright© 2004-2014 by Prado Software
All Rights Reserved.
@@ -152,7 +152,7 @@ The PRADO framework and the included demos are free software. They are released
the terms of the following BSD License.
-Copyright 2004-2013 by The PRADO Group (http://www.pradosoft.com)
+Copyright 2004-2014 by The PRADO Group (http://www.pradosoft.com)
All rights reserved.
--
cgit v1.2.3
From 57987c93c15da02d6e39ab238f0abc40fe11dc4a Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Sat, 23 Aug 2014 13:44:48 +0200
Subject: Updated version number and changes log
---
HISTORY | 28 ++++++++++++++++++++++
UPGRADE | 4 ++--
buildscripts/texbuilder/quickstart/quickstart.tex | 2 +-
composer.json | 12 +++++++++-
.../pages/Controls/Samples/TConditional/Home.page | 4 ++--
.../pages/GettingStarted/NewFeatures.page | 7 ++++++
framework/PradoBase.php | 2 +-
framework/Web/Javascripts/source/prado/prado.js | 2 +-
index.html | 2 +-
9 files changed, 54 insertions(+), 9 deletions(-)
(limited to 'index.html')
diff --git a/HISTORY b/HISTORY
index ef7b7d60..d6eec406 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,31 @@
+Version 3.2.4 Aug XX, 2014
+
+BUG: Issue #492 - Prado generates json_error when encoding an exception with non UTF-8 data (david0)
+ENH: Issue #494 - Adding toArray() and toJSON() to TActiveRecord (dmarko484)
+BUG: Issue #498 - Typo in TActiveFileUpload (Jens-mB)
+BUG: Issue #499 - Avoid scrolling when calling TControl::focus() (david0)
+BUG: Issue #502 - TSlider behaves strangely in TTabView (ctrlaltca)
+BUG: Issue #504 - Default Button cannot be referenced by . (ctrlaltca)
+BUG: Issue #506 - Unused lines of code in TLiteralColumn::initializeCell (cross)
+BUG: Issue #511 - TActivePager's ButtonCssClass property is not rendered in buttons (ctrlaltca)
+BUG: Issue #515 - THtmlArea should override Readonly property (ctrlaltca)
+BUG: Issue #516 - Check Validators in TActiveEditCommandColumn (ctrlaltca)
+BUG: Issue #517 - TXmlDocument adjustment (gnit)
+BUG: Issue #518 - Runtime Notice in Gettext::factory() (ctrlaltca)
+BUG: Issue #519 - For MySQL in case PDO::CASE_LOWER creating table info does not work (ganiuszka)
+BUG: Issue #246 - Refix: User date() instead of gmdate() in TLogRoute (drigolin)
+BUG: Issue #520 - Unknown runtime error with Internet Explorer 8 (david0)
+BUG: Issue #524 - JSON error (5): Malformed UTF-8 characters when encoding callback response (david0)
+BUG: Issue #526 - TJsonRpcProtocol::callMethod, requested method is called twice (jojoinside)
+BUG: Issue #527 - TJsonRpcProtocol::callMethod, semicolon must be removed (jojoinside)
+ENH: Ported tests to Selenium2
+ENH: avoid duplicate creation of T*CheckBoxList, T*RadioButtonList js items (ctraltca)
+BUG: Avoid an exception loop on callback error when headers have already been sent (ctrlaltca)
+BUG: Avoid rendering