Merge branch 'master' of github.com:yiisoft/yii2 into redis
* 'master' of github.com:yiisoft/yii2: (87 commits)
Added dirty attribute description.
Fixed doc about renderers.
Finished the initial draft of upgrading instructions
Fix attaching behavior via config
Changed default value of View::renderers.
Fix attaching behavior via config
Menu WIP
upgrading instructions WIP
Refactored Breadcrumbs.
Fixes issue #54: Implemented Breadcrumbs.
Added Breadcrumbs.php
Fixes issue #134
Rollback word consistencty over entire codebase (ref. #139).
Add ensureBehaviors() to detachBehavior*()
Fixes issue #124.
code reorganization fix.
reorganized app code. removed app template from framework folder.
Fixes issue #128.
Fixes issue #124.
Add Newlines
...
Conflicts:
tests/unit/framework/caching/ApcCacheTest.php
Showing
.travis.yml
0 → 100644
app/protected/views/site/index.php
deleted
100644 → 0
apps/bootstrap/css/site.css
0 → 100644
File moved
apps/bootstrap/protected/.htaccess
0 → 100644
apps/bootstrap/protected/config/assets.php
0 → 100644
docs/guide/active-record.md
0 → 100644
docs/guide/application.md
0 → 100644
docs/guide/authentication.md
0 → 100644
docs/guide/authorization.md
0 → 100644
docs/guide/bootstrap.md
0 → 100644
docs/guide/caching.md
0 → 100644
docs/guide/console.md
0 → 100644
docs/guide/controller.md
0 → 100644
docs/guide/dao.md
0 → 100644
docs/guide/error.md
0 → 100644
docs/guide/extension.md
0 → 100644
docs/guide/form.md
0 → 100644
docs/guide/gii.md
0 → 100644
docs/guide/i18n.md
0 → 100644
docs/guide/index.md
0 → 100644
docs/guide/installation.md
0 → 100644
docs/guide/logging.md
0 → 100644
docs/guide/migration.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/guide/model.md
0 → 100644
docs/guide/mvc.md
0 → 100644
docs/guide/overview.md
0 → 100644
docs/guide/performance.md
0 → 100644
docs/guide/query-builder.md
0 → 100644
docs/guide/security.md
0 → 100644
docs/guide/template.md
0 → 100644
docs/guide/testing.md
0 → 100644
docs/guide/theming.md
0 → 100644
docs/guide/title.md
0 → 100644
docs/guide/upgrade-from-v1.md
0 → 100644
This diff is collapsed.
Click to expand it.
docs/guide/upgrade.md
0 → 100644
docs/guide/url.md
0 → 100644
docs/guide/validation.md
0 → 100644
docs/guide/view.md
0 → 100644
framework/.htaccess
0 → 100644
This diff is collapsed.
Click to expand it.
framework/console/webapp/config.php
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
framework/helpers/JsExpression.php
0 → 100644
This diff is collapsed.
Click to expand it.
framework/helpers/Json.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/helpers/base/Json.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/widgets/Breadcrumbs.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
framework/widgets/Menu.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
tests/unit/framework/helpers/JsonTest.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
todo.md
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment