Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-11 18:46:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,677 Commits 3 Branches 54 Tags
47313eb77bdd2f620f34a1fb3cce62ddc80098df
Commit Graph

2632 Commits

Author SHA1 Message Date
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
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
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
mdomba (mdwork)
1459eb7a33 ajaxUpdate is never false in jquery.yiilistview.js 2012-08-22 12:05:02 +02:00
DaSourcerer
e90e445031 Update framework/web/filters/CHttpCacheFilter.php 
Small fix for phpdoc
 2012-08-21 08:12:16 +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
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
Alexander Makarov
7b63d13bc0 Fixed rules order for CUrlManager::addRules and $append=false 2012-08-16 23:39:22 +04:00
Alexander Makarov
17479ecc0f fixed crud phpdoc hint 2012-08-15 14:02:02 +04:00
mdomba (mdlap)
63ffca0194 (Fixes #1225, #769) yiiGridView.js getChecked() was not working if custom template was used 2012-08-15 00:06:55 +02:00
Qiang Xue
99487eb6e3 Fixes issue #1207. 2012-08-13 21:38:30 -04:00
DaSourcerer
2d738d9621 Fix for the previous commit 2012-08-13 02:33:01 +02:00
DaSourcerer
8de89415f1 Address missing ETags on 304 responses as mentioned in #1192 2012-08-13 02:27:08 +02:00
Qiang Xue
05441abf04 Fixes #1167: Reverted back the change to CComponent::evaluateExpression() about global function support 2012-08-12 08:42:17 -04:00
DaSourcerer
367db07f20 Small addition to the phpdoc regarding suppression of Cache-Control 
headers
 2012-08-11 17:35:42 +02:00
DaSourcerer
04b46c4395 Fix for #1192: Cache-Control is not being sent in case of 304 responses 2012-08-11 17:33:56 +02:00
Alexander Makarov
3f3f85acc5 Merge pull request #1164 from cebe/1163-gridview-no-empty-class 
[ci skip] fixes #1163 CGridview does not create empty class attribute anymore
 2012-08-10 12:19:46 -07:00
mdomba (mdwork)
c29be19d59 doc fix 
[ci skip]
 2012-08-10 12:49:14 +02:00
mdomba (mdwork)
c9c7c796b9 grammar fix 2012-08-10 12:28:49 +02:00
mdomba (mdwork)
e56620c888 fixed some syntax and proper doc 2012-08-10 10:30:38 +02:00
na3r
fe3dd55b50 fix farsi translation typo 2012-08-10 01:03:33 +04:30
mdomba (mdwork)
d071f08bae prevent output of spaces on new line in new created model 2012-08-09 15:39:11 +02:00
mdomba (mdlap)
a40ac64238 better error message for wrong connectionId 2012-08-09 00:30:01 +02:00
mdomba (mdlap)
53b1448de1 Merge branch 'master' of git://github.com/yiisoft/yii into 1099-gii-model-generator-connections 2012-08-08 21:38:07 +02:00
mdomba (mdlap)
ba6ab46d79 move action to proper controller 2012-08-08 18:54:11 +02:00
mdomba (mdwork)
1df0f13d1c added missing parameters documentation 2012-08-08 15:51:56 +02:00
mdomba (mdwork)
0ff56d34d7 added parameter description 2012-08-08 15:37:41 +02:00
mdomba (mdwork)
c621bfeb51 Issue #1099 - changed connectionID to sticky text field 2012-08-08 15:01:48 +02:00
mdomba (mdwork)
f7e148098d Merge branch 'master' of git://github.com/yiisoft/yii into 1099-gii-model-generator-connections 2012-08-08 12:33:32 +02:00
CeBe
634d1603b9 fixed empty css class attribute for CGridColumn 
fixes #1163
 2012-08-08 12:23:34 +02:00
mdomba (mdlap)
3fd13f9f91 remove second parameter on calls 2012-08-08 01:40:19 +02:00
mdomba (mdlap)
789938d1bf remove extra parameter from constructor 2012-08-08 00:07:17 +02:00
CeBe
74289854ce CGridview does not create empty class attribute 
fixes #1163 where rowCssClassExpression or rowCssClass could be empty
for certain rows.
 2012-08-07 22:28:20 +02:00
mdomba (mdlap)
5973d891e0 refactored CJavascriptExpression->_construct to get cleaner code 2012-08-07 18:35:06 +02:00
mdomba (mdlap)
65d5fdb7bd Merge branch 'master' of git://github.com/yiisoft/yii into 1161-unify-CJavascriptExpression-usage 2012-08-07 18:15:55 +02:00
mdomba (mdlap)
b3dc167db0 proper CJavascriptExpression check 2012-08-07 18:14:46 +02:00
mdomba (mdwork)
c89f31f886 Unify CJavascriptExpression usage 2012-08-07 16:01:39 +02:00
mdomba (mdwork)
524475f60c change strncmp with strpos 2012-08-07 15:13:44 +02:00