18050 Commits

Author SHA1 Message Date
f227d2fb15 Update README.md 2018-03-25 20:07:34 +08:00
101f5d7ccc merge from 2.0.15 2018-03-23 13:37:04 +08:00
5aa7bffedd Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  Fixed a small spelling mistake
  Tweaking a few grammatical bugs (#15932) [skip ci]
  CacheableWidgetBehaviorTest enhancements (#15930)
2018-03-21 19:41:35 +01:00
0244abcd5a Merge branch '2.0.15-dev'
* 2.0.15-dev:
  release version 2.0.15.1
  optimize table name
  `yii\db\ActiveRecord::findOne()` now accepts column names prefixed with table name
2018-03-21 19:41:03 +01:00
20aa508018 release version 2.0.15.1 2.0.15.1 2018-03-21 19:36:53 +01:00
b195d9e780 optimize table name 2018-03-21 18:07:30 +01:00
0af1c05d6a yii\db\ActiveRecord::findOne() now accepts column names prefixed with table name
fixes #15931
2018-03-21 17:44:22 +01:00
92ae4e243e Merge pull request #64 from yiichina/doc
merge from Doc
2018-03-21 19:04:11 +08:00
98aef96969 Update test-unit.md 2018-03-21 19:02:29 +08:00
491aee66d1 Update test-acceptance.md 2018-03-21 18:51:44 +08:00
cd98d6a1cf Update test-environment-setup.md 2018-03-21 18:24:24 +08:00
d419bb6061 Merge pull request #62 from biaoqianwo/patch-2
Update test-environment-setup.md
2018-03-21 18:19:47 +08:00
d4403d4ccd Merge pull request #63 from lkcode666666/patch-1
Update concept-properties.md
2018-03-21 18:18:16 +08:00
143d429975 Merge pull request #15934 from acorncom/patch-3
Fixed a small spelling mistake
2018-03-21 07:56:32 +02:00
be73606eee Fixed a small spelling mistake 2018-03-20 18:22:49 -06:00
055b73fece Tweaking a few grammatical bugs (#15932) [skip ci] 2018-03-20 21:30:35 +03:00
8aebdd8c17 CacheableWidgetBehaviorTest enhancements (#15930)
1) Better PhpDoc (removed PhpStorm warnings)
2) Small speed optimization: there is no need 42 iterations for counter increment test. 2 is enough.
2018-03-20 21:11:28 +03:00
4c16005af1 Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  guide-ja/db* updated
  WIP
  db-query-builder.md WIP
  db-active-record.md and db-dao.md updated
  docs/guide-ja update WIP
2018-03-20 13:45:43 +01:00
52ffaa1b25 Merge branch '2.0.15-dev'
* 2.0.15-dev:
  prepare for next release
  release version 2.0.15
  remove ColumnSchema import from mysql Schema because it conflicts with existing class
  Added russian docs
  Fixed grammar
  improved filtering condition on yii\db\ActiveRecord
  Wording adjustments and doc enhancements [skip ci]
  Fixed possible SQL injection through `ActiveRecord::findOne()`
  Fixes #15878: Fixed migration with a comment containing an apostrophe

Conflicts:
	framework/UPGRADE.md
2018-03-20 13:45:22 +01:00
33b45f6bba prepare for next release 2018-03-20 13:42:13 +01:00
702618a863 release version 2.0.15 2.0.15 2018-03-20 13:41:23 +01:00
a33b09dab3 remove ColumnSchema import from mysql Schema because it conflicts with existing class 2018-03-20 13:40:28 +01:00
f8560b7a85 Added russian docs 2018-03-20 13:19:45 +02:00
caab05b0a0 Fixed grammar 2018-03-20 12:47:50 +02:00
a38302fdfd improved filtering condition on yii\db\ActiveRecord 2018-03-20 11:42:28 +01:00
5f75916cde Wording adjustments and doc enhancements [skip ci] 2018-03-20 11:20:56 +01:00
b37f361ad7 Fixed possible SQL injection through ActiveRecord::findOne() 2018-03-20 11:20:56 +01:00
f33959419a Fixes #15878: Fixed migration with a comment containing an apostrophe 2018-03-20 11:19:10 +01:00
b4f1a507a2 Merge pull request #15926 from yiijan/guide-ja-1803
docs/guide-ja updated
2018-03-20 10:53:08 +02:00
43740be3f3 guide-ja/db* updated 2018-03-20 10:00:50 +09:00
115855443e WIP 2018-03-20 07:56:26 +09:00
Sam
1ebf951a59 Fixes #15492: Clarify tree traversal configuration (#15919) [skip ci] 2018-03-19 01:05:03 +03:00
aa085d93bf Removed fxp/composer-asset-plugin from git-workflow 2018-03-17 14:46:11 +02:00
a1a2932131 Added test to check issue #15902
Closes #15902
2018-03-17 13:30:27 +02:00
5a66299962 Removed unnecessary hyphens (#15914) 2018-03-17 00:02:41 +03:00
8a80e48f1d Fixes in docs [skip ci] (#15909) 2018-03-16 17:54:20 +03:00
58e7e1d947 db-query-builder.md WIP 2018-03-16 16:38:44 +09:00
89a496bb39 db-active-record.md and db-dao.md updated 2018-03-16 13:20:32 +09:00
6643bcfed2 docs/guide-ja update WIP 2018-03-16 07:31:24 +09:00
a7ccf65855 Update UPGRADE.md
fixes #15899
2018-03-15 13:18:59 +01:00
1963f6e2b5 Updated issue template [skip ci] 2018-03-15 01:30:14 +03:00
c31f9ac811 Fixes #15878: Fixed migration with a comment containing an apostrophe 2018-03-15 00:51:32 +03:00
d4c4294318 #15899 Updated cebe/markdown composer constraint 2018-03-15 00:48:00 +03:00
eab1d3116f Merge pull request #15897 from yiijan/internals-ja-1803
docs-Internals-ja-updated
2018-03-14 17:15:53 +02:00
0831fa2f09 translated bc.md to Japanese 2018-03-14 23:34:07 +09:00
2c5e5b4007 docs/internals-ja 2018-03 updates 2018-03-14 17:15:28 +09:00
b8fa37eaeb Merge pull request #15890 from w3lifer/patch-1
Cache Flushing as separate section
2018-03-13 18:11:15 +02:00
2962f1d8c1 Cache Flushing as separate section 2018-03-13 18:27:52 +03:00
61186b5bd5 prepare for next release 2018-03-13 16:15:29 +02:00
4bfe5e7a49 release version 2.0.14.2 2.0.14.2 2018-03-13 16:15:01 +02:00