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

15402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ArgosOleg
20b3ec22d6 Broken link 
[asset bundles](structure-asset-bundles.md)
change on
[asset bundles](structure-assets.md),
 2014-11-14 16:14:10 +02:00
Alexander Makarov
41c167b9a7 Merge pull request #6051 from anders-akero/patch-1 
Update rest-error-handling.md
 2014-11-14 14:13:36 +03:00
Anders Åkerö
eb07fd3ee8 Update rest-error-handling.md 
Should be parentheses instead of square brackets
 2014-11-14 11:12:04 +00:00
Funson Lee
00f218f3fb Merge branch 'master' of github.com:yii2-chinesization/yii2 2014-11-14 17:53:43 +08:00
Funson Lee
1b47030f44 new translation chinese 2014-11-14 17:51:51 +08:00
Funson Lee
cd5bb5af48 for check 2014-11-14 17:49:20 +08:00
花生
fdd8950be8 Merge pull request #31 from waltye/patch-1 
Update structure-assets.md
 2014-11-14 16:40:37 +08:00
waltye
b1826e4f18 Update structure-assets.md 
'不熟'应为'部署'，'公斤'应为'工具'。
 2014-11-14 16:37:42 +08:00
Qiang Xue
de8966079f Fixes #5367: Added yii\grid\DataColumn::encodeLabel 2014-11-13 21:28:47 -05:00
Serge Postrash
c6cb205653 Added encodeLabel param to \yii\grid\DataColumn 
Use case:

```
    echo GridView::widget([
        ...
        'columns' => [
            ...
            [
                'attribute' => 'created_at',
                'label' => '<span data-toggle="tooltip" class="glyphicon glyphicon-time" title="'.Yii::t('app', 'Created At').'"></span>',
                'encodeLabel' => false,
                ...
            ],
```
 2014-11-13 21:26:39 -05:00
Carsten Brandt
cfe874607f fixed return type for redis simple strings 
fixes #4745
 2014-11-13 16:44:06 +01:00
Alexander Makarov
2de384e3b0 Fixes #6041 2014-11-13 18:07:57 +03:00
Carsten Brandt
f9bb1e21cb fixed elasticsearch test break 2014-11-13 15:57:49 +01:00
Carsten Brandt
f23ba6cbdc explicitly set the language for elasticsearch script 
groovy is now always on in ES 1.3.0

fixes #5662
 2014-11-13 15:39:36 +01:00
Andrei Chugunov
0afd13f0da Update BaseHtml.php 
Some Annotation Typos

close #6029
 2014-11-13 14:27:24 +01:00
PommeVerte
c86989ea82 Added mention of RAW format for runtime-responses 
close #6036
 2014-11-13 14:13:47 +01:00
Nobuo Kihara
b4607001a9 docs/guide-ja/structure-assets.md 
- prepared for translation [ci skip]
- docs/guide-ja/structure-widgets.md - changed "コンテント" to "コンテンツ" [ci skip]
- docs/guide-ja/* - changed "ドキュメンテーション" to "ドキュメント" [ci skip]
- docs/guide-ja/intro-yii.md - inserted the Chinese character "易" [ci skip]
- docs/guide-ja/structure-assets.md - WIP [ci skip]
- docs/guide-ja/structure-assets.md - completed [ci skip]

close #6037
 2014-11-13 14:03:31 +01:00
东方孤思子（Paris·QianSen）
0b15c2800c Update translation-teams.md 2014-11-13 16:53:11 +08:00
Qiang Xue
5960f49d7f Merge branch 'master' of git://github.com/yiisoft/yii2 2014-11-12 20:08:55 -05:00
Qiang Xue
6a222c8a64 Fixes #6033. 2014-11-12 20:08:49 -05:00
Qiang Xue
8d0cac8cba Fixes #5220 2014-11-12 15:37:09 -05:00
Qiang Xue
b7012ca935 Fixes #5799: yii\bootstrap\ButtonGroup::buttons can take all options that are supported by yii\bootstrap\Button 2014-11-12 14:54:03 -05:00
fly
d36bf9e8a8 Pass all the button's config array to Button::widget() instead of creating new one item by item. Now allowed to pass in ButtonGroup button's configs any possible attributes(like tagName, encodeLabel, etc). 2014-11-12 14:51:21 -05:00
Alexander Makarov
4e47b67fc5 Merge pull request #6027 from lucianobaraglia/master 
Rest versioning spanish guide changes and fixes [skip ci]
 2014-11-12 18:58:36 +03:00
Luciano Baraglia
c53a5100c2 Rest versioning spanish guide changes and fixes [skip ci] 2014-11-12 12:41:18 -03:00
Alexander Makarov
262b533df3 Merge pull request #6025 from lucianobaraglia/master 
[skip ci] Spanish guide
 2014-11-12 18:38:47 +03:00
Luciano Baraglia
dcb68bb464 rest routing spanish guide fixes and changes [skip ci] 2014-11-12 12:05:57 -03:00
Luciano Baraglia
a8020d2253 Rest response formatting spanish guide changes [skip ci] 2014-11-12 11:41:15 -03:00
Carsten Brandt
477aeecf95 Merge pull request #6023 from lucianobaraglia/master 
More Spanish guide changes and fixes
 2014-11-12 15:03:34 +01:00
Luciano Baraglia
beae91979c Spanish guide updates and fixes [skip ci] 2014-11-12 10:58:17 -03:00
Luciano Baraglia
4fb47a23d4 Spanish guide minor fix [skip ci] 2014-11-12 10:22:40 -03:00
Luciano Baraglia
865b782f48 Merge remote-tracking branch 'upstream/master' 2014-11-12 10:08:20 -03:00
Alexander Makarov
42ca4bb991 Fixed yii\log\DbTarget migration and SQLs to use float column for log_time 2014-11-12 14:06:39 +03:00
Paul Klimov
a79828d160 Merge pull request #6021 from ilgiz-badamshin/master 
Typo fix in guide-ru
 2014-11-12 12:00:16 +02:00
ilgiz-badamshin
80849ab935 Typo fix in guide-ru 2014-11-12 12:56:35 +03:00
munawer
a24c2a6a09 Fixes in guide [ci skip] 2014-11-12 12:26:51 +03:00
Funson Lee
eef719348f english 2014-11-12 16:58:36 +08:00
Qiang Xue
866214e75a Fixes #6018: When setting the encode option via yii\widgets\ActiveRecord::errorOptions, it works the other way around [skip ci] 2014-11-11 21:24:07 -05:00
Luciano Baraglia
a26d07cedb More Spanish guide small changes [skip ci] 2014-11-11 20:13:41 +03:00
Luciano Baraglia
565875f6cf Spanish Guide minor changes [skip ci] 2014-11-11 20:13:40 +03:00
Luciano Baraglia
bb216655c4 More Spanish guide small changes [skip ci] 2014-11-11 13:28:37 -03:00
Luciano Baraglia
b5c396bd41 Spanish Guide minor changes [skip ci] 2014-11-11 13:12:20 -03:00
Klimov Paul
d6d4df4b8b Merge branch 'master' of github.com:yiisoft/yii2 2014-11-11 16:33:38 +02:00
Klimov Paul
63e434b473 Safe real path resolving added to yii\console\controllers\AssetController::combineCssFiles() 2014-11-11 16:33:16 +02:00
Carsten Brandt
3fb1effeab Update structure-assets.md 
typo
 2014-11-11 14:39:40 +01:00
Qiang Xue
61b7079993 Fixes #6007: added doc about asset bundle name [skip ci] 2014-11-11 08:08:18 -05:00
Klimov Paul
112ad80d6e Fixed yii\console\controllers\AssetController breaks CSS URLs, which start from '/' 2014-11-11 14:49:20 +02:00
Klimov Paul
1605905fc1 Fixed CCS for yii\authclient\widgets\AuthChoice does not loaded if popupMode disabled 2014-11-11 13:37:39 +02:00
munawer
255cf947a3 Typo fix in guide 2014-11-11 11:24:38 +03:00
Funson Lee
a8a012b94d Merge branch 'master' of github.com:yii2-chinesization/yii2 2014-11-11 09:20:18 +08:00