php/yii2

mirror of https://github.com/yiisoft/yii2.git synced 2025-08-22 19:31:02 +08:00

Files

Carsten Brandt bc4324c041 Merge branch 'master' into redis

* master: (613 commits)
  fixed typo
  Fixes #1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Added example for dividers to bootstrap Nav
  Checkboxlist documentation fix
  Added "Using controller action to render errors"
  Fix doc
  Renamed DetailView attribute type to format
  encode email in Formatter
  Added default status code setting.
  "yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
  fix rbac select statement
  Comments cleanup.
  Reverted closeButton
  Nomenclature and code realignment.
  better nginx config
  guide about using bootstrap less files
  Include Schema in new migrations by default
  ...

Conflicts:
	framework/yii/db/ActiveRecord.php
	framework/yii/db/ActiveRelation.php
	tests/unit/data/config.php

2013-11-22 15:04:08 +01:00

yii

Merge branch 'master' into redis

2013-11-22 15:04:08 +01:00

CHANGELOG.md

reorganized the main repo to satisfy PSR-0.

2013-05-21 21:19:05 -04:00

composer.json

updated composer.json to be less restrictive

2013-11-13 01:34:41 +01:00

LICENSE.md

updated license information.