Commits · 93ca701a10331ca1289f9d458e01026836c1069f · Rotua Panjaitan / yii2

15 Nov, 2013 3 commits
- Merge branch 'master' of github.com:yiisoft/yii2 into sphinx · 93ca701a
  Paul Klimov authored Nov 15, 2013
  
  93ca701a
- Unsupported "update counters" feature removed from Sphinx Active Record. · 37862b6e
  Paul Klimov authored Nov 15, 2013
  
  37862b6e
- moved db interfaces and traits back to yii/db. · 42a58870
  Qiang Xue authored Nov 14, 2013
  
  42a58870
14 Nov, 2013 12 commits
- changed color setting. · 3106105e
  Qiang Xue authored Nov 14, 2013
  
  3106105e
- Sphinx ActiveRecord added as blank. · d6c38829
  Klimov Paul authored Nov 14, 2013
  
  d6c38829
- removed extra line. · c7b430cf
  Qiang Xue authored Nov 14, 2013
  
  c7b430cf
- Unit test for "yii\sphinx\Query" advanced · 6593c8ce
  Klimov Paul authored Nov 14, 2013
  
  6593c8ce
- Composite primary key support removed from Sphinx schema. · 9459b440
  Klimov Paul authored Nov 14, 2013
  
  9459b440
- Separated method "match" added to "yii\sphinx\Query" · 47a2e211
  Klimov Paul authored Nov 14, 2013
  
  47a2e211
- Added readme and updated test helper classes. · 8775e25c
  Qiang Xue authored Nov 14, 2013
  
  8775e25c
- Added readme about tests. · 220e6dc4
  Qiang Xue authored Nov 14, 2013
  
  220e6dc4
- fixed functional test. · cd7a4a67
  Qiang Xue authored Nov 14, 2013
  
  cd7a4a67
- Merge pull request #1097 from yiisoft/db-traits · b4492112
  Qiang Xue authored Nov 14, 2013
```
Db traits
```
  b4492112
- reverted change of count() signature · 8250cfbb
  Carsten Brandt authored Nov 14, 2013
  
  8250cfbb
- Allow Validator::except to be either a string or an array. · 368dd4b1
  Qiang Xue authored Nov 13, 2013
  
  368dd4b1
13 Nov, 2013 25 commits
- Merge pull request #1200 from zhuravljov/master · 71a619d2
  Carsten Brandt authored Nov 13, 2013
```
Fixed gii after merge #1184
```
  71a619d2
- Fixed gii after merge #1184 · c5ee83bf
  KiTE authored Nov 13, 2013
  
  c5ee83bf
- moved indexBy() trait -> interface + removed findWith from interface · 1acdbb74
  Carsten Brandt authored Nov 13, 2013
  
  1acdbb74
- updated interface and trait php-doc in yii\ar · 51faa62e
  Carsten Brandt authored Nov 13, 2013
```
[ci skip]
```
  51faa62e
- Option array value support added to "yii\sphinx\Query" · 0275a224
  Klimov Paul authored Nov 13, 2013
  
  0275a224
- dataprovider: reset orderBy when counting · ced7ee1b
  Carsten Brandt authored Nov 13, 2013
```
strict sql dbms like postgres would fail otherwise
```
  ced7ee1b
- added unit tests for active dataprovider and fixed query tests · 9448c3d4
  Carsten Brandt authored Nov 13, 2013
  
  9448c3d4
- Methods "replace()" and "batchReplace()" added to "yii\sphinx\Command" · aae221dd
  Klimov Paul authored Nov 13, 2013
  
  aae221dd
- Parameter "options" added to "yii\sphinx\Command::update()" · 0839ceb5
  Klimov Paul authored Nov 13, 2013
  
  0839ceb5
- refactored ActiveRecord classes to use Interfaces and traits · 65338972
  Carsten Brandt authored Nov 13, 2013
```
this allows us to implement other activerecord implementations based on
NoSQL dbms
```
  65338972
- Merge pull request #1197 from slavcodev/asset-dir · 6fd0f0da
  Qiang Xue authored Nov 13, 2013
```
Move AppAsset from config to assets directory
```
  6fd0f0da
- Move AppAsset from config to assets directory · 4c4f7bd7
  slavcodev authored Nov 13, 2013
  
  4c4f7bd7
- Merge branch 'master' into db-traits · c8c7f59d
  Carsten Brandt authored Nov 13, 2013
```
Updated AR classes with the latest changes from master to go on with
separation of AR query classes in traits.

Conflicts:
	framework/yii/db/ActiveQuery.php
	framework/yii/db/ActiveRecord.php
	framework/yii/db/ActiveRelation.php
```
  c8c7f59d
- renamed AR trait classes · b8e31d50
  Carsten Brandt authored Nov 13, 2013
  
  b8e31d50
- "yii\sphinx\Query" has been composed, unit test for it added. · 36da1617
  Paul Klimov authored Nov 13, 2013
  
  36da1617
- Options support for "yii\sphinx\Command::callSnippet()" added. · 6b5b9976
  Paul Klimov authored Nov 13, 2013
  
  6b5b9976
- Allow "on" and "attributes" to take either array or string for validators. · 5b0886f1
  Qiang Xue authored Nov 13, 2013
  
  5b0886f1
- Merge pull request #1184 from slavcodev/only-arrays-in-rules · 447bad5a
  Qiang Xue authored Nov 13, 2013
```
Using only arrays in rules instead comma-separated string
```
  447bad5a
- Fixes #1193 · 75dc290a
  Qiang Xue authored Nov 13, 2013
  
  75dc290a
- Fixes #1191 · 36c28bee
  Qiang Xue authored Nov 13, 2013
  
  36c28bee
- Fixes #1195. · da93d9b4
  Qiang Xue authored Nov 13, 2013
  
  da93d9b4
- Merge branch 'master' of github.com:yiisoft/yii2 · 2d866186
  Qiang Xue authored Nov 13, 2013
  
  2d866186
- typo fix. · 2f8ee2a8
  Qiang Xue authored Nov 13, 2013
  
  2f8ee2a8
- Methods "callSnippet" and "callKeywords" added to "yii\sphinx\Command" · cc156ba8
  Paul Klimov authored Nov 13, 2013
  
  cc156ba8
- Sphinx unit tests advanced. · 07ad008d
  Paul Klimov authored Nov 13, 2013
  
  07ad008d