php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-19 16:01:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into redis

Browse Source 
* master: (806 commits)
  avoid confusing docs about autoload return value
  doc fix.
  Fixed doc.
  Fixed autoloader behavior according to leading \
  Fix in RequestPanel
  changed to trace from info.
  Removed yii\debug\Module::enabled.
  minor enhancement of debugger.
  Refactored the basic app.
  Added ErrorAction.
  Use `hasAttribute()` instead to avoid code duplication
  refactored NavBar and basic app navbar.
  test break fix.
  test break fix.
  Fixed test breaks.
  #735: removed hiddenInput to avoid confusion.
  ResizableAsset typo fix!
  Update radio and checkbox due to e3801fbf6b
  css fix.
  Fixed the basic app template.
  ...

Conflicts:
	.travis.yml
	tests/unit/data/config.php
This commit is contained in:
Carsten Brandt
2013-08-12 00:45:37 +02:00
parent b85c87bc55 afebb37129
commit 133e5c6e35
605 changed files with 52601 additions and 15026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/db/ActiveRelation.php
View File

@@ -8,8 +8,6 @@
namespace yii\db;
use yii\db\Connection;
use yii\db\Command;
use yii\base\InvalidConfigException;
/**