prado/framework/Web/UI/WebControls/THtmlArea4.php, branch prado-3.2
Fork of Prado PHP framework
https://emkael.info/cgit/prado/atom?h=prado-3.2
2014-08-21T15:32:55Z
Fix #515
2014-08-21T15:32:55Z
Fabio Bas
ctrlaltca@gmail.com
2014-04-20T17:42:36Z
urn:sha1:e3811f0ba597a2b3fe477000f7f54bf75680fbe1
(cherry picked from commit f95623e43ce5829b91d1fde0e7978aca96e3e936)
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