Chris Harris
c50ba2e800
Fixed comment [skip ci]
2016-02-20 16:06:17 -08:00
Chris Harris
454b90a3f5
Merge branch 'master' of git://github.com/yiisoft/yii2 into 9562-add-char-datatype
2016-02-20 15:56:33 -08:00
Chris Harris
d18563bd38
Fixed comment formatting. Renamed ColumnSchemaBuilder::CAT_TEXT to ColumnSchemaBuilder::CAT_STRING. [skip ci]
2016-02-20 15:55:59 -08:00
Evgeniy Tkachenko
d804950d09
Update phpDoc BaseMailer::compose()
2016-02-20 18:44:29 +03:00
Chris Harris
51b99320bd
Sqlite specific schema builder class actually gets loaded now
2016-02-20 06:53:31 -08:00
Evgeniy Tkachenko
8f26e93b20
Update phpDoc MailerInterface::compose()
2016-02-20 16:58:13 +03:00
Chris Harris
8c0b075bed
Merge branch '9340-add-after-method-to-migrations-schema-builder' into 9562-add-char-datatype
2016-02-20 01:59:00 -08:00
Chris Harris
a9b454ac49
Merge branch 'master' of git://github.com/yiisoft/yii2 into 9340-add-after-method-to-migrations-schema-builder
2016-02-20 01:57:21 -08:00
Chris Harris
eaeb926768
Adds char datatype to framework
2016-02-20 01:52:23 -08:00
Alexander Makarov
d7f6f11193
HTMLPurifier dependency updated to ~4.7.0
2016-02-20 02:57:45 +03:00
Chris Harris
0400eb9cee
Resolved merge conflict in changelog
2016-02-18 02:34:02 -08:00
Alexander Makarov
bf3d8fe40f
Use $arr[] = 'x' instead of array_push
2016-02-16 14:35:15 +03:00
Alexander Makarov
4bc7c51180
Removed unnecessary if
2016-02-16 14:13:43 +03:00
Alexander Makarov
5c4e2d4372
Removed unnecessary parentheses
2016-02-16 14:08:43 +03:00
Alexander Makarov
1f7134634b
Use static:: instead of $this for static method calls
2016-02-16 14:06:23 +03:00
Alexander Makarov
97bc4e0567
Fixed wrong case in method calls
2016-02-16 13:53:53 +03:00
Alexander Makarov
608479dc53
Use actual cache methods instead of deprecated ones, fixed static method call in non-static context
2016-02-16 13:50:42 +03:00
Alexander Makarov
b6caff1952
Removed unused imports
2016-02-16 13:48:09 +03:00
Alexander Makarov
1af5980b35
Removed unused use statement, replaced preg_split with explode
2016-02-16 13:46:13 +03:00
Alexander Makarov
69d8f2296f
Merge pull request #10860 from pana1990/patch
...
Add @since [skip ci]
2016-02-16 01:42:14 +03:00
Alexander Makarov
386aacae5c
Fixes #10422 : yii\db\ColumnSchemaBuilder::buildNotNullString now returns NULL instead of empty string to properly work with MSSQL (reverted from commit 2498a9b3bb)
2016-02-16 01:39:42 +03:00
Daniel Gomez Pan
8b0f28f780
Add @since [skip ci]
2016-02-15 23:06:58 +01:00
nevermnd
2498a9b3bb
Fixes #10422 : yii\db\ColumnSchemaBuilder::buildNotNullString now returns NULL instead of empty string to properly work with MSSQL
2016-02-15 23:55:34 +03:00
Sam Mousa
af5f5d0e3e
Fixes #9851 : Fixed partial commit / rollback in nested transactions
2016-02-15 23:32:32 +03:00
quantum
7b46bd1f7c
Fixes #10451 : Check of existence of $_SERVER in \yii\web\Request before using it
2016-02-15 23:22:45 +03:00
Alexander Makarov
1ec972fbf7
Fixes #10610 : Added BaseUrl::$urlManager to be able to set URL manager used for creating URLs
2016-02-15 22:35:58 +03:00
Dmitry Naumenko
a41208b37f
Merge pull request #10777 from pana1990/10764-enh-options-tag
...
WIP #10764
2016-02-15 21:01:14 +02:00
Daniel Gomez Pan
3bf3c20710
Merge remote-tracking branch 'upstream/master' into 10764-enh-options-tag
...
# Conflicts:
# framework/CHANGELOG.md
2016-02-15 17:37:40 +01:00
Daniel Gomez Pan
2825e06451
Update changelog [skip ci]
2016-02-15 15:15:18 +01:00
githubjeka
f0c666cd6f
Update FileValidator phpDoc: see link added to maxSize
2016-02-15 15:14:39 +03:00
githubjeka
07c3403f27
Update FileValidator phpDoc: see link added to maxSize
2016-02-15 15:12:36 +03:00
githubjeka
e23f47f49a
Update phpDoc maxSize of FileValidator
2016-02-15 14:51:39 +03:00
Dmitry Naumenko
1d43bb5421
Merge pull request #10852 from githubjeka/uploadfile_doc
...
phpDoc: return of UploadedFile::getInstance()
2016-02-15 13:29:38 +02:00
githubjeka
984c51ab1a
Update phpDoc: return of UploadedFile::getInstance() / getInstanceByName()
2016-02-15 14:18:16 +03:00
Carsten Brandt
c04f068439
prepare for next release
2016-02-14 15:51:30 +01:00
Carsten Brandt
9b5f6cb188
prepare for 2.0.7 release
...
- adjust version
- build classmap
- build phpdoc @property annotations
- build mime-type file
2016-02-14 15:45:55 +01:00
Alexander Makarov
a1846cd57c
Fixed issue number
2016-02-14 01:04:18 +03:00
Carsten Brandt
4359f4665b
docs adjustement for blameable behavior
2016-02-13 14:44:10 +01:00
SilverFire - Dmitry Naumenko
5714ae576d
Updated CHANGELOG, UPGRADE.md
2016-02-13 12:39:29 +02:00
SilverFire - Dmitry Naumenko
4f75bd70b9
BlameableBehavior::getValue() changed to make value processing consistent with AttributeBehavior::getValue()
2016-02-13 12:37:35 +02:00
SilverFire - Dmitry Naumenko
2e13136ca8
AttributeBehavior::getValue() now respects the callable in array format
2016-02-13 12:33:18 +02:00
Sam Mousa
8ea4c660da
Several improvements to DI container
...
- Refactored invoke into separate resolve method (reusability)
- Added support for associative params array
- Added PHPUnit group doc to DI tests.
- Improved the tests for better coverage, and fixed a bug discovered by the new tests.
close #10811
2016-02-12 17:29:18 +01:00
Carsten Brandt
3d719d057e
review yii\web namespaces docs
2016-02-12 16:21:32 +01:00
Carsten Brandt
997dfa3e11
review guide and UPGRADE file
2016-02-12 15:56:54 +01:00
Carsten Brandt
31bd0e392b
Merge pull request #10828 from yiisoft/activequery-alias2
...
Activequery::joinWith() alias
2016-02-12 14:30:05 +01:00
Carsten Brandt
ce35739469
joinWith implementation cleanup
2016-02-12 12:45:29 +01:00
Carsten Brandt
3f8df39f45
more tests for joinWith alias
...
also test on joining the same relation twice
2016-02-12 12:35:29 +01:00
Carsten Brandt
5f19e7aa41
Added Alias Syntax for joinWith()
...
Add alias syntax to joinWith(), e.g. joinWith('author a').
No need to know the table name for defining an alias for the relation.
fixes #2377 , alternative to #8788 , which allows later implementation of
getting alias and column name ambiguation.
depends on #10813 to be merged first.
2016-02-12 12:35:28 +01:00
Carsten Brandt
157d6c79cc
fixes #4972 by adding and alias() to ActiveQuery
...
allows defining an alias without knowing the model table name.
2016-02-12 12:34:16 +01:00
Klimov Paul
d22a3a0a07
Fixed yii\validators\EachValidator does not respect skipOnEmpty rule parameter
2016-02-12 13:33:36 +02:00
