Files
Carsten Brandt 98079b84a2 Merge branch 'master' into Erik-r-2359-formatter-refactored
* master: (1112 commits)
  Removed unused "use" statements
  Fixed array syntax
  Removed unused "use" statements
  Перевод runtime-handling-errors.md на русский язык
  Mark tests with problematic DBMS as skipped.
  Fixes #3511: Dropped `yii.allowAction()` and modified `yii.confirm()` in `yii.js` to support callbacks
  Update runtime-url-handling.md
  Update runtime-url-handling.md
  Update runtime-url-handling.md
  Update runtime-url-handling.md
  Update runtime-url-handling.md
  Create runtime-url-handling.md
  Fixed test break.
  Fixes #3410: yii.activeForm.js now supports adding/removing fields dynamically
  Fixes #2914: `ActiveForm::fieldConfig` will be merged recursively with the `$options` parameter in `ActiveForm::field()`
  Fixes #4936 [skip ci]
  Reverted/fixed some incorrect changes.
  missing "." sign
  Fixed formatting, initialized options array
  Fixed phpdoc
  ...

Conflicts:
	framework/CHANGELOG.md
	framework/base/Formatter.php
	framework/i18n/Formatter.php
	tests/unit/framework/base/FormatterTest.php
	tests/unit/framework/i18n/FormatterTest.php
2014-09-07 20:44:48 +02:00
..