Alexander Makarov
47313eb77b
Merge pull request #1285 from resurtm/1281-mime-types
...
[ci skip] Fixes #1281 : ogg/ogv/theora/xiph mime types.
2012-08-28 13:39:31 -07:00
Carsten Brandt
ed49b77ca0
Merge pull request #525 , branch 'issue-124'
...
* issue-124:
better fix for issues #124
added @since annotation
added docblocks to CMysqlCommandBuilder+CHANGELOG
added some unit tests mysql
Add CMysqlCommandBuilder to handle joins on update
2012-08-28 21:48:52 +02:00
Carsten Brandt
266df50702
better fix for issues #124
...
changed position of JOIN in UPDATE by overwriting applyJoin()
2012-08-28 21:27:26 +02:00
Carsten Brandt
d77234b1e7
Merge branch 'master' of https://github.com/yiisoft/yii into issue-124
...
* 'master' of https://github.com/yiisoft/yii : (651 commits)
Updated guide Gii Model Generator page screenshot.
adjusted CHANGELOG
Requirements checking slightly improved.
Enhanced CHANGELOG description
Requirements checker: added support of the Oracle database (pdo_oci extension)
MSSQL driver types refinements.
Requirements checker: added support of the MSSQL (pdo_dblib and pdo_sqlsrv extensions).
Language fixes.
Preparations for merging fixes of the #556 into 1.1.13 codebase.
[docs][blog] 'yiic' to 'Gii'
ajaxUpdate is never false in jquery.yiilistview.js
Added /docs/guide/fr/caching.overview.twt
Added /docs/guide/fr/basics.controller.txt
Added /docs/guide/fr/basics.mvc.txt
Update framework/web/filters/CHttpCacheFilter.php
Update docs/guide/fr/toc.txt
[NL] Dutch messages translation updated
added history.js license
prepare for next release.
prepare for 1.1.12 release.
...
Conflicts:
CHANGELOG
2012-08-28 21:21:27 +02:00
Carsten Brandt
7cc18cb78f
Merge pull request #1295 from resurtm/guide-gii-screenshot
...
Updated guide Gii Model Generator page screenshot.
[ci skip]
2012-08-27 05:10:15 -07:00
resurtm
870dbd9a66
Updated guide Gii Model Generator page screenshot.
2012-08-27 13:45:22 +06:00
Carsten Brandt
f64b63cb43
adjusted CHANGELOG
2012-08-27 10:11:57 +03:00
Carsten Brandt
c1ef1fc83d
Merge pull request #1291 from resurtm/mssql-requirements
...
Requirements checker: added support of the MSSQL (pdo_dblib and pdo_sqlsrv extensions).
[ci skip]
2012-08-27 00:10:01 -07:00
resurtm
1654a84113
Requirements checking slightly improved.
2012-08-27 09:55:00 +06:00
resurtm
aafe2ce273
Merge branch 'master' of git://github.com/yiisoft/yii into mssql-requirements
...
Conflicts:
CHANGELOG
requirements/index.php
2012-08-27 09:48:10 +06:00
Carsten Brandt
c45143e8ad
Enhanced CHANGELOG description
2012-08-27 02:28:25 +03:00
Carsten Brandt
a44fdc13a8
Merge pull request #1293 from resurtm/oracle-requirements
...
Requirements checker: added support for the Oracle database (pdo_oci extension)
[ci skip]
2012-08-26 16:26:38 -07:00
resurtm
320cf0ecca
Requirements checker: added support of the Oracle database (pdo_oci extension)
2012-08-26 11:48:10 +06:00
resurtm
29d9786248
MSSQL driver types refinements.
2012-08-26 11:35:48 +06:00
resurtm
26fe1bcba2
Requirements checker: added support of the MSSQL (pdo_dblib and pdo_sqlsrv extensions).
2012-08-26 11:32:16 +06:00
Carsten Brandt
d25ab06522
Merge pull request #1123 from resurtm/556-mysql-column-comment
...
1.1.13, Enh #556 : Added CDbColumnSchema::$comment which stores comment for the table column, comment retrieving is working for MySQL, PgSQL and Oracle.
MSSQL is not supported yet
2012-08-25 05:04:06 -07:00
resurtm
054e6247af
Language fixes.
2012-08-25 18:02:26 +06:00
resurtm
c3b1f9cb98
Fixes #1281 : ogg/ogv/theora/xiph mime types.
2012-08-25 13:30:55 +06:00
resurtm
4565d1efee
Preparations for merging fixes of the #556 into 1.1.13 codebase.
2012-08-25 10:16:26 +06:00
resurtm
81cd764447
Merge branch 'master' of git://github.com/yiisoft/yii into 556-mysql-column-comment
2012-08-25 10:02:11 +06:00
Carsten Brandt
e5c131de2a
Merge pull request #1273 from softark/docs-ja
...
[docs][blog], [docs][blog][ja] changed 'yiic' to 'Gii'
[ci skip]
2012-08-23 04:01:30 -07:00
softark
966d60dd4b
Merge branch 'master' into docs-ja
2012-08-23 19:52:11 +09:00
softark
47d4539d84
[docs][blog] 'yiic' to 'Gii'
2012-08-23 19:50:40 +09:00
mdomba (mdwork)
1459eb7a33
ajaxUpdate is never false in jquery.yiilistview.js
2012-08-22 12:05:02 +02:00
Maurizio Domba
8dce29b6c0
Merge pull request #1269 from marsuboss/patch-1
...
Added /docs/guide/fr/basics.controller.txt
[ci skip]
2012-08-22 00:06:40 -07:00
Maurizio Domba
c805e2e2af
Merge pull request #1270 from marsuboss/patch-2
...
Added /docs/guide/fr/caching.overview.txt
[ci skip]
2012-08-22 00:05:30 -07:00
MarsuBoss
c927aa72f8
Added /docs/guide/fr/caching.overview.twt
2012-08-22 08:38:26 +02:00
MarsuBoss
d3e8bdf5a3
Added /docs/guide/fr/basics.controller.txt
2012-08-22 08:10:10 +02:00
Maurizio Domba
71b0c9c6dd
Merge pull request #1261 from DaSourcerer/patch-17
...
Small fix for phpdoc in framework/web/filters/CHttpCacheFilter.php
[ci skip]
2012-08-21 02:24:58 -07:00
Maurizio Domba
8c7df5f778
Merge pull request #1262 from marsuboss/patch-2
...
Added /docs/guide/fr/basics.mvc.txt
[ci skip]
2012-08-21 02:23:58 -07:00
MarsuBoss
2516f6c8ea
Added /docs/guide/fr/basics.mvc.txt
2012-08-21 10:28:55 +02:00
DaSourcerer
e90e445031
Update framework/web/filters/CHttpCacheFilter.php
...
Small fix for phpdoc
2012-08-21 08:12:16 +03:00
Qiang Xue
b1154bb5e8
Merge pull request #1259 from Blizzke/master
...
Updated Dutch translation
2012-08-20 04:46:18 -07:00
Maurizio Domba
9f0955f594
Merge pull request #1260 from marsuboss/patch-1
...
Update docs/guide/fr/toc.txt
[ci skip]
2012-08-20 02:52:24 -07:00
marsuboss
9c30ae0641
Update docs/guide/fr/toc.txt
2012-08-20 12:37:09 +03:00
Steve Guns
673a48c730
[NL] Dutch messages translation updated
2012-08-20 10:43:53 +02:00
mdomba (mdlap)
1ed2b9ad8b
added history.js license
2012-08-19 15:07:00 +02:00
Qiang Xue
bebece36ed
prepare for next release.
2012-08-19 08:30:32 -04:00
Qiang Xue
b600af6313
prepare for 1.1.12 release.
2012-08-19 08:27:23 -04:00
Qiang Xue
ad47786c1e
Merge pull request #1247 from mdomba/1099-gii-model-generator-connections
...
1099 gii model generator connections
2012-08-19 05:20:04 -07:00
mdomba (mdlap)
22afb3fef0
forgot to remove the comment doc
2012-08-18 00:37:20 +02:00
mdomba (mdwork)
902d00dfdc
prevent occasional errors (invalid connectionId)
2012-08-17 15:38:39 +02:00
mdomba (mdwork)
c980ff506c
proper action for autocomplete
2012-08-17 15:37:35 +02:00
mdomba (mdwork)
2686ca3e5f
set new autocomplete options when connectionId chages
2012-08-17 15:36:58 +02:00
mdomba (mdwork)
72c2498b72
calling ajax from automcomplete has performace issues
2012-08-17 15:35:48 +02:00
mdomba (mdwork)
41b71d901e
no braces for single lines
2012-08-17 15:34:51 +02:00
mdomba (mdwork)
3352390616
Merge branch 'master' of git://github.com/yiisoft/yii into 1099-gii-model-generator-connections
2012-08-17 15:33:32 +02:00
Alexander Makarov
910e950bf4
Merge pull request #1243 from samdark/curlmanager-addrules-wrong-order-fix
...
Fixed rules order for CUrlManager::addRules and $append=false
2012-08-16 12:42:54 -07:00
Alexander Makarov
6dd32240a0
updated changelog
2012-08-16 23:41:36 +04:00
Alexander Makarov
7b63d13bc0
Fixed rules order for CUrlManager::addRules and $append=false
2012-08-16 23:39:22 +04:00
