Commit Graph

2672 Commits

Author SHA1 Message Date
DaSourcerer
79fdf1d8fb Replaced CModel with actual model name 2012-10-06 17:50:12 +02:00
DaSourcerer
4e48424352 Completed phpdoc comments for the controller template 2012-10-06 13:43:08 +02:00
resurtm
02547a69fb Removed extra tabs in COciCommandBuilder::applyLimit(). 2012-09-04 21:11:01 +06:00
Carsten Brandt
00dc4add94 fixes issue #1330
default value null for string column in SQLite
2012-09-04 03:12:18 +02:00
Carsten Brandt
c7f44e8653 Update framework/db/CDbCommand.php
typo

[ci skip]
2012-09-03 23:45:59 +03:00
Carsten Brandt
76f24b369e doc enhancement to CDbCommand fixes #1272 2012-09-03 22:43:56 +02:00
Carsten Brandt
87e93f1edf Merge pull request #1250 from andyhu/patch-1
Update framework/web/CHttpRequest.php
2012-09-03 13:36:49 -07:00
Carsten Brandt
cdefc64c83 fixes #291 CFormatter dates can now be strtotime values
makes #1172 obsolete
2012-09-03 22:32:09 +02:00
Carsten Brandt
5b8a973189 manual merge of #962 including unit tests 2012-09-03 22:14:03 +02:00
Carsten Brandt
ccd32774d2 enhanced doc in CHttpRequest to allow autocomplete $cookie
fixes #862
2012-09-03 21:41:44 +02:00
Carsten Brandt
33ebfd63e8 fixes #1326, added unit tests for #741 2012-09-03 21:33:48 +02:00
Carsten Brandt
9c3ba4ef44 naming and changelog file 2012-09-03 21:08:39 +02:00
Carsten Brandt
70cb6c30fa Merge branch 'issue-117' of https://github.com/rcoelho/yii into rcoelho-issue-117
* 'issue-117' of https://github.com/rcoelho/yii:
  Added support to register the messages directory for extensions. Fixes #117.
2012-09-03 20:04:06 +02:00
Carsten Brandt
447c76b2e0 renamed CCombinedLogFilter to CChainedLogFilter
added changelog line
2012-09-03 19:57:26 +02:00
Carsten Brandt
ac826b54c1 Merge branch '684-combined-logfilter' of https://github.com/cebe/yii into cebe-684-combined-logfilter
* '684-combined-logfilter' of https://github.com/cebe/yii:
  added CCombinedLogFilter

Conflicts:
	framework/logging/CLogRoute.php
2012-09-03 19:52:49 +02:00
Carsten Brandt
21c24a0bfe reverted pull request #1325
fix did not address the real problem
2012-09-03 19:45:17 +02:00
Carsten Brandt
be1fbf1982 Merge branch 'master' into 93-relational-beforefind-criteria-modification
* master: (180 commits)
  Updated changelog with last-modified date change.
  Changed the CHttpCacheFilter to use RFC 1123 complaint dates when returning the last-modified header.
  tabs...
  gii: better default validation "length" rule for fixed-point / floating-point field type (MYSQL)
  fixes #1319
  updated comment in CHttpSession
  Update framework/YiiBase.php
  Update docs/guide/database.arr.txt
  New unit test for enhanced $gCProbability s/getters in CHttpSession #486. Fixed those methods to process corner cases properly. Initial $gCProbability is now double(1.0), was > 1.0 before.
  Bug #112: MSSQL: database abstraction layer now uses native transaction support of the SQLSRV driver.
  Forgot about spaces in comments creating procedure call. [ci skip]
  Better comments testing method name.
  Forgot about local MSSQL database settings.
  MSSQL unit testing SQL file reformatted and decorated. MSSQL testing class improved. Added unit tests for column comments retrieving.
  Removed old message.
  Update docs/guide/topics.i18n.txt
  Update docs/guide/topics.i18n.txt
  Requirements checker: russian (ru_RU) messages.
  Minor fixes and refinements to the MSSQL unit tests.
  better fix for issues #124
  ...

Conflicts:
	UPGRADE
2012-09-03 19:21:10 +02:00
Qiang Xue
2147fae345 Merge pull request #1328 from bramp/last-mod-rfc-1123
Changed the CHttpCacheFilter to use RFC 1123 complaint dates
2012-09-03 07:58:47 -07:00
Andrew Brampton
d0bbd3cee6 Changed the CHttpCacheFilter to use RFC 1123 complaint dates when returning the last-modified header. 2012-09-03 09:54:36 -04:00
tomaszkane
36e01c71bf tabs... 2012-09-03 12:06:19 +02:00
tomaszkane
407294de4a gii: better default validation "length" rule for fixed-point / floating-point field type (MYSQL) 2012-09-03 12:02:14 +02:00
mdomba (mdlap)
d1668b0e3f fixes #1319 2012-09-01 12:49:40 +02:00
Carsten Brandt
096b536c6d updated comment in CHttpSession
[ci skip]
2012-08-31 18:09:41 +03:00
Carsten Brandt
ea95350a97 Merge pull request #1309 from tom--/486-unit-test
#486 unit test
2012-08-31 08:05:18 -07:00
Brett Zamir
8b2c61507c Update framework/YiiBase.php
Some grammar fixes
2012-08-31 18:01:55 +08:00
tom--
8149bd05b0 Merge branch 'master' of git://github.com/yiisoft/yii into 486-unit-test 2012-08-29 16:08:15 -04:00
tom--
d14469c2f5 New unit test for enhanced $gCProbability s/getters in CHttpSession #486. Fixed those methods to process corner cases properly. Initial $gCProbability is now double(1.0), was > 1.0 before. 2012-08-29 16:07:29 -04:00
resurtm
5d29a4aaf8 Merge branch 'master' of git://github.com/yiisoft/yii into 112-sqlsrv-transactions 2012-08-29 23:55:04 +06:00
resurtm
62d0119cce Bug #112: MSSQL: database abstraction layer now uses native transaction support of the SQLSRV driver. 2012-08-29 23:52:27 +06:00
resurtm
289444a96d MSSQL unit testing SQL file reformatted and decorated. MSSQL testing class improved. Added unit tests for column comments retrieving. 2012-08-29 23:02:03 +06:00
resurtm
668b5f3622 Merge branch 'master' of git://github.com/yiisoft/yii into 1289-mssql-db-column-comments 2012-08-29 21:38:47 +06:00
Carsten Brandt
851bfc0d8a Merge pull request #1288 branch '486-http-session-gc-probability' of https://github.com/resurtm/yii into resurtm-486-http-session-gc-probability
* '486-http-session-gc-probability' of https://github.com/resurtm/yii:
  Refinements and $gCProbability now can be 0.00000005% not just a 0.001%.
  Enh #486: CHttpSession::$gCProbability and CDbHttpSession::$gCProbability are floats now. Minimal $gCProbability value has been changed to the 0.001%, was 1% before, default value left unchanged (1%).

Conflicts:
	CHANGELOG
2012-08-29 13:15:43 +02:00
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
f19ebd30c6 Working draft of MSSQL column comments support. 2012-08-26 13:41:52 +06:00
resurtm
3884f21789 Refinements and $gCProbability now can be 0.00000005% not just a 0.001%. 2012-08-25 23:16:49 +06:00
resurtm
01b1777b7b Merge branch 'master' of git://github.com/yiisoft/yii into 486-http-session-gc-probability
Conflicts:
	CHANGELOG
2012-08-25 22:44:11 +06:00
resurtm
054e6247af Language fixes. 2012-08-25 18:02:26 +06:00
resurtm
e1af079c43 Enh #486: CHttpSession::$gCProbability and CDbHttpSession::$gCProbability are floats now. Minimal $gCProbability value has been changed to the 0.001%, was 1% before, default value left unchanged (1%). 2012-08-25 17:51:51 +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
andyhu
d9dde75fb8 Update framework/web/CHttpRequest.php
See issue https://github.com/yiisoft/yii/issues/1249
2012-08-18 21:45:29 +08:00