prado/framework/Data, branch prado-3.2 Fork of Prado PHP framework https://emkael.info/cgit/prado/atom/framework/Data?h=prado-3.2 2014-08-26T11:14:33Z Support for all PRADO DB drivers! 2014-08-26T11:14:33Z Daniel darthdaniel85@gmail.com 2013-12-09T07:04:04Z urn:sha1:93792e60746f8d34fa675ba834ca36552f6016df Fix #519 2014-08-21T15:32:54Z Fabio Bas ctrlaltca@gmail.com 2014-04-15T06:34:36Z urn:sha1:37e772cb8582fe772dbea72286874cf5335dd895 (cherry picked from commit 3abca1f10ace63b2daa93870f17049c047b53abe) Adding toArray() and toJSON() to TActiveRecord(cherry picked from commit 3f7dab44ea0b45dcdc5d590d94659010ef1eddda) 2014-08-21T15:21:23Z David Marko dmarko484@gmail.com 2014-01-07T13:28:27Z urn:sha1:30cd2aea091bdf455cb8d3464264ba7292330a96 Removed all @version $Id comments: they were managed by svn and are useless with git 2014-08-21T15:21:19Z Fabio Bas ctrlaltca@gmail.com 2014-01-06T21:44:30Z urn:sha1:dcaa0390c1d1335f47f0dd4b8784dc550e3d9f93 (cherry picked from commit 3e9969766153839abfb7de59e0c778a604bfbf55) Conflicts: 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 Happy 2014! 2014-08-21T15:20:54Z Fabio Bas ctrlaltca@gmail.com 2014-01-06T21:41:46Z urn:sha1:fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 (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 Merge up to r3319 2013-09-11T13:57:07Z Ciro Mattia Gonano ciromattia@gmail.com 2013-09-11T13:56:48Z urn:sha1:3069eaf35e833ffe4a1c1c7829dd7e168ae27420 Upgrade to newly released 3.2.2 2013-07-24T10:22:49Z Ciro Mattia Gonano ciromattia@gmail.com 2013-07-24T10:22:49Z urn:sha1:0f332e6564ed67ef7eb4d715ce3bcb5ff54c50cf Update to 3.2.1 2013-04-24T07:59:48Z Ciro Mattia Gonano ciromattia@gmail.com 2013-04-24T07:59:46Z urn:sha1:daa4dde508865ef0f08e584987b0695d4847809a merged r3261, r3262 to trunk/ 2013-01-22T22:43:34Z ctrlaltca 2013-01-22T22:43:34Z urn:sha1:b97ece103198be2ff3dc1a259588fb849266534b bumped year to 2013, integrated recent changes from branch/3.2 2013-01-19T10:17:39Z ctrlaltca 2013-01-19T10:17:39Z urn:sha1:f2a2465a97591ad478ba6b99dc4bb55b09620452