Commit Graph

3816 Commits

Author SHA1 Message Date
Carsten Brandt
34057b1df1 adjusted the default Grid column classes to changes made in #2052
use get...Content() instead of render...Content()
2013-09-04 17:24:49 +02:00
Carsten Brandt
dba20dbef5 better fix for #106 according to discussion in #2052 2013-09-04 16:58:19 +02:00
Carsten Brandt
655988bc8e Merge branch 'master' into 106-cgridcolumn-extend
* master: (741 commits)
  fixed test break for php < 5.3.0
  better fix for #2378
  CHANGELOG line for #2777
  guide fix about autoloading
  Re-added call to Yii::autoload to import() to keep speed
  Replaced explicit call to Yii::autoload() with call to autoloader stack
  fixed CApplication docs about autoloader
  fixed formatting, adjusted changelog
  Changing from "ob_end_flush" to "ob_end_clean"
  Changelog update
  Code formatting
  Handle thrown exception in widgets when 'captureOutput' is set to true.
  [UK][Guide] typos  [ci skip]
  Issue #2654 has been added to CHANGELOG
  CDbCommand::buildQuery() no longer throw exception if 'from' is missing.
  Unnecessary comment at CErrorHandler::render() has been removed.
  Chapter 'Using 3rd-Party Autoloaders' has been added to guide
  CErrorHandler::errorAction via AJAX has been added to UPGRADE
  Issue #2753 has been added to CHANGELOG
  CErrorHandler has been refactored to respect errorAction on AJAX request.
  ...

Conflicts:
	CHANGELOG
2013-09-04 16:51:23 +02:00
Carsten Brandt
9a934901c0 Merge branch 'fix-cache-dir-permissions' of https://github.com/ujovlado/yii into ujovlado-fix-cache-dir-permissions
* 'fix-cache-dir-permissions' of https://github.com/ujovlado/yii:
  added CHANGELOG line
  added tests for CFileCache cacheFileMode and cachePathMode
  changed formatting
  added options to set mode (used by mkdir and chmod)  for cache directory and files
  cache dir creation with correct file mod

Conflicts:
	CHANGELOG
2013-09-04 15:12:36 +02:00
Carsten Brandt
f5e592f22d better fix for #2378 2013-09-04 15:05:17 +02:00
Carsten Brandt
10b4b0f063 Merge branch '2738-ActiveRecord.tableName' of https://github.com/velosipedist/yii into velosipedist-2738-ActiveRecord.tableName
* '2738-ActiveRecord.tableName' of https://github.com/velosipedist/yii:
  removed occasional FormInput file
  fix #2378 CActiveRecord::tableName() in namespaced model
  Ability to substitute model attribute name, to use custom data getter. It is not dangerous to use any custom fields and getters, because it will work for read-only.
2013-09-04 14:54:35 +02:00
Carsten Brandt
5513075ce2 Re-added call to Yii::autoload to import() to keep speed
import will check for classmap first before triggering autoloader stack.

issue #2777
2013-09-04 14:42:40 +02:00
Carsten Brandt
045b38ff45 Replaced explicit call to Yii::autoload() with call to autoloader stack
This allows usage of normal class names to be loaded by autoloaders
prepended to the Yii::autoloader()

Should be BC if there is only Yii autoloader and not cause much trouble
when other autoloaders are properly implemented. Works fine with
composer autoloader.

fixes #2777
2013-09-04 13:49:22 +02:00
Carsten Brandt
c47c8ebf89 fixed CApplication docs about autoloader 2013-09-04 13:31:17 +02:00
Paul Klimov
38692ca642 Merge pull request #2605 from dizeee/patch-1
Consistent getting table schema in CActiveRecord
2013-09-03 05:30:15 -07:00
Alexander Makarov
3d60a36b94 fixed formatting, adjusted changelog 2013-09-03 00:00:21 +04:00
Raphaël Cohen
b5f92df886 Changing from "ob_end_flush" to "ob_end_clean" 2013-08-31 12:58:40 +02:00
Raphaël Cohen
6742f79674 Code formatting 2013-08-31 12:06:36 +02:00
Raphaël Cohen
c19ee647b7 Handle thrown exception in widgets when 'captureOutput' is set to true. 2013-08-30 19:22:12 +02:00
Carsten Brandt
4f1bc7bf6d Merge pull request #2827 from klimov-paul/enh-file-helper-create-directory
Enhancement: CFileHelper::createDirectory
2013-08-30 08:05:52 -07:00
Paul Klimov
98d077200a CDbCommand::buildQuery() no longer throw exception if 'from' is missing. 2013-08-30 15:54:00 +03:00
Alexander Makarov
9eedce2da1 Merge pull request #2830 from klimov-paul/2753-error-action-with-ajax
Fix #2753 CErrorHandler::errorAction ignored at PHP error + AJAX request
2013-08-30 04:13:13 -07:00
Paul Klimov
1656e5742f Unnecessary comment at CErrorHandler::render() has been removed. 2013-08-30 14:00:24 +03:00
Paul Klimov
d0b76dcff0 CErrorHandler has been refactored to respect errorAction on AJAX request. 2013-08-29 16:49:51 +03:00
Alexander Makarov
4b183f1e59 Merge pull request #2826 from klimov-paul/2821-file-validator
Fix #2821 file validator
2013-08-29 04:13:58 -07:00
Paul Klimov
cba9c4d81e Merge branch 'master' of github.com:yiisoft/yii into 2770-client-script-render-script-batch 2013-08-29 13:25:38 +03:00
Paul Klimov
2f3fe0303a Doc comments at 'CFileHelper::createDirectory()' has been fixed. 2013-08-29 13:17:48 +03:00
Paul Klimov
4e398ece03 Private method 'CFileHelper::mkdir()' has been converted into public 'CFileHelper::createDirectory()'. 2013-08-29 13:13:57 +03:00
Paul Klimov
d4a01ab1f3 Merge pull request #2800 from nineinchnick/2785-composeMultipleInsertCommand-table-name
Fixes #2785 use proper table name with schema when creating a multi insert command
2013-08-29 02:16:21 -07:00
Paul Klimov
11c774b0bb Merge branch '268-cdbcriteria-count' of https://github.com/nineinchnick/yii into nineinchnick-268-cdbcriteria-count 2013-08-29 11:56:38 +03:00
Paul Klimov
31e7ab1c04 CFileValidator has been fixed. 2013-08-29 11:41:25 +03:00
Pavel Voronin
7360887b85 Merge branch 'master' into patch-1
Conflicts:
	CHANGELOG
2013-08-27 12:05:26 +04:00
Alexander Makarov
1c2aadf8e6 fixed code style and phpdoc for #2817 2013-08-26 22:21:00 +04:00
Zander Baldwin
48ecf6ca68 Update Method Parameters in CDbSchema::createIndex()
Update the spelling of the third parameter of CDbSchema::createIndex() to become plural, rather than singular, to better reflect the correct data that this parameter accepts.
2013-08-26 19:10:21 +01:00
Zander Baldwin
4b0a19300c Update Database Schema Component
Update the CDbSchema component to allow passing columns names to CDbSchema::createIndex() and CDbSchema::addForeignKey() as an array, as well as a string of comma-separated column names.
2013-08-26 16:30:10 +01:00
John Was
bb07a7abdd detect properly if criteria->select starts with a count() expression in CActiveFinder->count() method 2013-08-21 21:45:08 +02:00
John Was
b1efd178e4 use proper table name with schema when creating a multi insert command 2013-08-21 20:49:15 +02:00
Charles Pick
e5a036fd7c fix code style 2013-08-21 14:46:09 +01:00
Charles Pick
4497be0844 fix changelog 2013-08-21 14:42:35 +01:00
Leo R. Lundgren
50082a8a64 Correct invalid tags in the PHPdoc. 2013-08-21 00:58:55 +02:00
Rupert-RR
4aaae10174 Added a check for the OK file upload code to avoid checking all the
alternatives when the upload was ok.
Return from the method in the file size error branch when the file was
not uploaded.
Added a check in the MIME type validation to only check MIME types if
the CUploadedFile's tempName is not empty.
2013-08-19 14:44:30 +04:00
Vladimír Kriška
9273becd3d changed formatting 2013-08-16 11:31:27 +02:00
Vladimír Kriška
65a5fa5494 added options to set mode (used by mkdir and chmod) for cache directory and files 2013-08-16 11:31:27 +02:00
Vladimír Kriška
45cab435c1 cache dir creation with correct file mod 2013-08-16 11:31:26 +02:00
Klimov Paul
6cae70cb94 Merge branch 'master' of github.com:yiisoft/yii into 2770-client-script-render-script-batch 2013-08-15 10:14:04 +03:00
Klimov Paul
09c69286fb CClientScript::renderScriptBatch() has been improved to sort html options only if they are specified. 2013-08-15 10:11:37 +03:00
John Was
3706106ea1 allow arrays in asc/desc properties of virtual attributes 2013-08-14 22:46:44 +02:00
Alexander Makarov
887e61bf56 Merge pull request #2761 from klimov-paul/2756-relation-lazy-load-with-condition-doubles-condition
Fix for #2756: relation lazy load with condition doubles condition
2013-08-14 10:41:26 -07:00
Klimov Paul
540a1d27a0 CClientScript::renderScriptBatch() has been fixed to group scripts with different HTML options correctly. 2013-08-14 20:28:55 +03:00
Pavel Voronin
c2352b74a8 another way to return relative paths: findFilesRecursive main loop instead of findFiles post-processing 2013-08-14 15:37:00 +04:00
gureedo
78f33b5444 phpdoc fix for CActiveRecord 2013-08-14 16:09:44 +06:00
Pavel Voronin
311ca1c3c8 Merge remote-tracking branch 'upstream/master' into patch-1 2013-08-14 10:44:55 +04:00
Pavel Voronin
a9871c68a2 code conv fix, charset specifying and docs improvement 2013-08-14 10:23:29 +04:00
Klimov Paul
16616abf4e Double condition applying for Active Record relation lazy loading has been fixed. 2013-08-13 11:11:21 +03:00
Steve Guns
d599fda131 [NL] Updated translation for latest release 2013-08-13 08:44:00 +02:00