php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-25 03:01:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,402 Commits 10 Branches 80 Tags
b2c92d3f4be40cb151dd9ea0f8f335928d42757c
Commit Graph

15402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Seliuk
35b54345b5 Handling $query->joinWith called inside of other $query->joinWith within Closure (called inside Closure). Ex.: ``php $query->joinWith( [ 'rel1' => function($query) { $query->joinWith( [ 'rel2' => function($query) { // ... } ] ); } ] ); `` 2014-09-10 14:49:11 -04:00
Qiang Xue
b835422479 Fixes #4897: Added `yii\helpers\FileHelper::mimeMagicFile 2014-09-10 14:17:16 -04:00
Alexander Makarov
353cf1b345 Merge pull request #4981 from SDKiller/patch-2 
Updated phpdoc for \yii\widgets\DetailView [ckip ci]
 2014-09-10 22:10:23 +04:00
Qiang Xue
44b5e8ef60 Fixes #4954: MSSQL column comments are not retrieved correctly 2014-09-10 13:44:04 -04:00
Serge Postrash
286e8efe9f Updated phpdoc for \yii\widgets\DetailView [ckip ci] 
This widget usage is not only restricted with `Model` or associative array (see its `normalizeAttributes()` method)
 2014-09-10 21:39:07 +04:00
dima
97b4c505ad fix authchoice.js 2014-09-10 20:36:35 +03:00
Carsten Brandt
c1d98722aa Update tutorial-i18n.md 
typod
 2014-09-10 19:29:30 +02:00
Qiang Xue
0e4da43838 Merge pull request #3906 from cebe/Erik-r-2359-formatter-refactored 
[WIP] formatter refactored
 2014-09-10 13:27:03 -04:00
Carsten Brandt
2b38d6ab33 Merge branch 'master' into Erik-r-2359-formatter-refactored 
* master: (22 commits)
  Fixes #4971: Fixed hardcoded table names in `viaTable` expression in model generator
  Fixed test break.
  Fixes #4955: Replaced callbacks with events for `ActiveForm`
  Fix brackets
  Rename `\yii\web\User` component param for consistency
  Html::button() type is `button` by default
  Fix bug in Estonian translation
  Typo fixed inside \yii\rest\CreateAction
  Fixed test break.
  Fixed test case.
  note about validation rules order
  Return a fixtures cleanup in case of a failing test
  Update finnish translation
  skip fixture controller test on HHVM
  Make unit tests cleanup a DB after finish
  Fixes #4945: Added `yii\test\ArrayFixture`
  added array fixture class
  minor doc adjustment [skip ci]
  Fixes #4948. Thanks, @johan162
  Fixes #4947
  ...

Conflicts:
	framework/UPGRADE.md
 2014-09-10 19:26:04 +02:00
Carsten Brandt
0723f409ab finished the first structure of the guide on formatting 2014-09-10 19:24:14 +02:00
Carsten Brandt
c8f8f654ce fixed paragraph formatting 2014-09-10 18:41:25 +02:00
Carsten Brandt
d82195706f UPGRADE and CHANGELOG notes for the Formatter changes 2014-09-10 17:56:25 +02:00
Stephen Seliuk
3847630994 Fixes #4971: Fixed hardcoded table names in viaTable expression in model generator 2014-09-10 14:15:59 +04:00
Qiang Xue
00e4d63e57 Fixed test break. 2014-09-09 22:51:26 -04:00
Qiang Xue
d4a54e58eb Merge pull request #4978 from thiagotalma/patch-1 
Fix brackets
 2014-09-09 22:42:53 -04:00
Qiang Xue
f50f840a55 Fixes #4955: Replaced callbacks with events for ActiveForm 2014-09-09 22:37:27 -04:00
Thiago Talma
cc40fb5b13 Fix brackets 
There were too many brackets.
 2014-09-09 23:24:51 -03:00
Qiang Xue
071c2e55a0 Merge pull request #4977 from creocoder/web-user-param-rename1 
Rename `\yii\web\User` component param for consistency
 2014-09-09 21:57:47 -04:00
Alexander Kochetov
090e550a3d Rename \yii\web\User component param for consistency 2014-09-10 05:55:07 +04:00
Qiang Xue
09395ed2ec Merge pull request #4974 from creocoder/html-button-type-fix 
Html::button() type is `button` by default
 2014-09-09 15:35:26 -04:00
Alexander Kochetov
ed251d8993 Html::button() type is button by default 2014-09-09 23:32:00 +04:00
Alexander Makarov
26526ff075 Merge pull request #4963 from stevekr/master 
[skip ci] Fix bug in Estonian translation
 2014-09-09 13:01:00 +04:00
Steve
d90fc6ced5 Fix bug in Estonian translation 2014-09-09 11:25:35 +03:00
Qiang Xue
e8e53883ff Merge pull request #4961 from creocoder/fix-typos-1 
Typo fixed inside \yii\rest\CreateAction
 2014-09-08 20:34:11 -04:00
Alexander Kochetov
1bd738243c Typo fixed inside \yii\rest\CreateAction 2014-09-09 04:18:53 +04:00
Carsten Brandt
47648a4b9f final cleanup 2014-09-09 00:00:45 +02:00
Carsten Brandt
3f75728083 refactored size format 2014-09-08 23:34:51 +02:00
Carsten Brandt
916d2c182d ensure some BC 
ensure some features that were recently added to formatter keep working after refactoring
 2014-09-08 20:46:02 +02:00
Carsten Brandt
9418c9d236 unit tests and some locale depended fixes 2014-09-08 19:56:01 +02:00
Carsten Brandt
8d397e7f0e finished currency formatter 2014-09-08 18:03:13 +02:00
Qiang Xue
c4141f94f6 Fixed test break. 2014-09-08 08:19:43 -04:00
Qiang Xue
0a95c49149 Fixed test case. 2014-09-08 08:01:53 -04:00
Carsten Brandt
91e973ce7b note about validation rules order 
fixes #2268
 2014-09-08 13:21:14 +02:00
Carsten Brandt
6e6fc1ec7a Merge pull request #4953 from janisto/message_fi_update-3 
Update finnish translation
 2014-09-08 13:14:21 +02:00
Carsten Brandt
8c07086b51 Merge pull request #4951 from TriAnMan/testdbcleanup 
Make unit tests cleanup a DB after finish
 2014-09-08 13:13:13 +02:00
Anton Andersen
8e66325fa1 Return a fixtures cleanup in case of a failing test 2014-09-08 15:04:42 +04:00
Jani Mikkonen
77091123e6 Update finnish translation 2014-09-08 14:01:14 +03:00
Carsten Brandt
383b9d32ab skip fixture controller test on HHVM 2014-09-08 12:39:28 +02:00
Anton Andersen
09ae5fb595 Make unit tests cleanup a DB after finish 2014-09-08 13:52:11 +04:00
Qiang Xue
377cb09aa8 Fixes #4945: Added yii\test\ArrayFixture 2014-09-07 18:33:30 -04:00
Ragazzo
a5245ad048 added array fixture class 2014-09-07 18:29:16 -04:00
Qiang Xue
92f7b3fb06 minor doc adjustment [skip ci] 2014-09-07 18:27:08 -04:00
Alexander Makarov
abb807bd9d Fixes #4948. Thanks, @johan162 2014-09-08 00:25:59 +04:00
Alexander Makarov
06a3f5ff8a Fixes #4947 2014-09-08 00:24:40 +04:00
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
Carsten Brandt
f8f0ff5445 moved formatter to i18n namespace 2014-09-07 20:40:34 +02:00
Carsten Brandt
065db64db3 finsihed formatter implementation 
neads cleanup
 2014-09-07 20:35:15 +02:00
Qiang Xue
8ff4db3c02 added anchor [skip ci] 2014-09-07 12:42:18 -04:00
Qiang Xue
b1e7c753ae Fixes #2702: added doc about customizing error response format [skip ci] 2014-09-07 12:40:50 -04:00
Carsten Brandt
2a15ae12e6 refactored number formatting 2014-09-07 18:34:47 +02:00