Commit Graph

10662 Commits

Author SHA1 Message Date
Alexander Makarov
6580b608e1 Fixes #5874: Upgraded Twitter Bootstrap to 3.3.x 2014-11-04 01:51:11 +03:00
Qiang Xue
9da53b702c typo fix [skip ci] 2014-11-03 17:05:00 -05:00
Qiang Xue
b10f580dfd Finished routing tutorial [skip ci] 2014-11-03 17:03:44 -05:00
Alexander Makarov
0dcd2abf77 Merge pull request #5896 from otsec/ru-message-just-now
[skip ci] Added missing russian translation for asRelativeTime() formatter
2014-11-04 00:53:49 +03:00
Artem Belov
6eb570ad67 Added missing russian translation for message "just now" for relative time formatter 2014-11-04 00:11:28 +03:00
Qiang Xue
0319c29f43 Merge pull request #5895 from otsec/array-helper-to-array-recursive-fix
Fix for recursive calls ArrayHelper::toArray() with objects
2014-11-03 15:27:08 -05:00
Artem Belov
bcd2392673 ArrayHelper::toArray() now uses $properties parameter in recursive calls for descending objects 2014-11-03 23:12:04 +03:00
relbraun
58e780ff3d Hebrew translation 2014-11-03 22:15:31 +03:00
Alexander Makarov
9ea3f5bc09 Added "configuration" and "environment" to Russian translation dictionary 2014-11-03 20:59:56 +03:00
keltstr
f172523d3d Improvements for Russian translation of concept-configurations.md 2014-11-03 20:57:46 +03:00
Alexander Makarov
e54fe02a12 Merge pull request #5889 from RichWeber/master
[skip ci] add structure-application-components.md [UK]
2014-11-03 20:13:59 +03:00
RichWeber
2f29c87c97 add structure-application-components.md 2014-11-03 19:04:23 +02:00
Alexander Makarov
ae70708eee Merge pull request #5887 from TriAnMan/doc-fix
Fix upgrade doc [skip ci]
2014-11-03 19:32:05 +03:00
Anton Andersen
17960584c0 Fix typo [skip ci] 2014-11-03 20:21:53 +04:00
Anton Andersen
4ee638c4bd Fix typo [skip ci] 2014-11-03 20:16:44 +04:00
Anton Andersen
14f9d1490d Fix typo [skip ci] 2014-11-03 19:53:54 +04:00
Anton Andersen
be84215be6 Fix upgrade doc [skip ci] 2014-11-03 19:48:25 +04:00
Qiang Xue
d9bf92a3f9 Merge pull request #5882 from softark/doc-fix-20141103
docs/guide/structure-views.md - missing ".php" added [ci skip]
2014-11-03 07:57:27 -05:00
Nobuo Kihara
53cb1047ce docs/guide/structure-views.md - missing ".php" [ci skip] 2014-11-03 21:54:56 +09:00
Nobuo Kihara
f47f6b8207 Merge branch 'master' of github.com:softark/yii2 2014-11-03 21:52:07 +09:00
Qiang Xue
0b755395d4 working on guide [skip ci] 2014-11-02 22:11:45 -05:00
Alexander Makarov
a15dbb2191 Merge pull request #5869 from huoshi5151/patch-2
[skip ci] typo fixed
2014-11-02 18:29:17 +03:00
huoshi5151
21cb13737f typo fixed
typo fixed
2014-11-02 23:25:59 +08:00
Alexander Makarov
c174d539f4 Merge pull request #5867 from softark/docs-guide-ja-20141102
Docs guide ja 20141102 [ci skip]
2014-11-02 16:27:04 +03:00
Nobuo Kihara
39aed212a6 Merge branch 'master' into docs-guide-ja-20141102 2014-11-02 22:00:25 +09:00
Nobuo Kihara
c03d902cf2 docs/guide-ja/* changes for "render" and "rendering" [ci skip] 2014-11-02 21:56:30 +09:00
Nobuo Kihara
218de42937 docs/guide-ja/intro-*, docs/guide-ja/start-* minor changes [ci skip] 2014-11-02 21:44:58 +09:00
Alexander Makarov
afe3229302 Merge pull request #5866 from softark/docs-guide-structure-views-typo
[skip ci] Docs guide structure views typo
2014-11-02 15:44:57 +03:00
Nobuo Kihara
8c89f847e7 docs/guide-ja/intro-upgrade-from-v1.md minor fix [ci skip] 2014-11-02 21:43:24 +09:00
Nobuo Kihara
4ec0e61d81 docs/guide/structure-views.md grammar fix [ci skip] 2014-11-02 21:35:30 +09:00
Nobuo Kihara
e50d9e82b0 Merge branch 'master' of github.com:yiisoft/yii2 2014-11-02 21:31:17 +09:00
Alexander Makarov
ff3ef7b90e Merge pull request #5859 from huoshi5151/patch-2
[ci skip] typo fixed
2014-11-02 13:33:30 +03:00
Alexander Makarov
8aedf0c75f Merge pull request #5861 from huoshi5151/patch-3
[skip ci] typo fixed
2014-11-02 13:32:46 +03:00
Alexander Makarov
bab7e519b1 Merge pull request #5862 from huoshi5151/patch-4
[skip ci] repeat fixed
2014-11-02 13:32:37 +03:00
huoshi5151
a1fd9c6469 repeat fixed
repeat fixed
2014-11-02 16:59:22 +08:00
huoshi5151
31f858e736 typo fixed
typo fixed
2014-11-02 16:38:43 +08:00
huoshi5151
38fe290e7f typo fixed
typo fixed
2014-11-02 14:45:30 +08:00
Qiang Xue
530537e48f Fixes #5817 [skip ci] 2014-11-01 20:41:34 -04:00
Carsten Brandt
f2385720a8 Update rest-authentication.md 2014-11-01 22:58:21 +01:00
Alexander Makarov
eefa4e52f8 Merge pull request #5853 from DelphiSerg/patch-1
[ci skip] Update output-formatter.md
2014-11-01 23:51:38 +03:00
DelphiSerg
597dfd81e6 Update output-formatter.md 2014-11-01 20:11:21 +02:00
Nobuo Kihara
2fe64eea69 Merge branch 'master' of github.com:yiisoft/yii2 2014-11-01 22:22:37 +09:00
Nobuo Kihara
0bd1d80397 Merge branch 'master' of github.com:softark/yii2 2014-11-01 22:09:05 +09:00
Carsten Brandt
ecb113f1d0 fixed model serializtaion example 2014-11-01 14:05:56 +01:00
Alexander Makarov
8ed9ce0c7f Merge pull request #5841 from mongosoft/feature
[ci skip] Grammatical errors and typos fixes
2014-11-01 13:42:52 +03:00
Nobuo Kihara
decf61a4f3 docs/guide/structure-models.md - typo fixed [ci skip]
close #5847
2014-11-01 11:19:19 +01:00
Nobuo Kihara
9dcfd350ee guide-ja
docs/guide-ja/* word fixed - 「基いて」を「基づいて」に修正 [ci skip]
docs/guide-ja/structure-models.md added [ci skip]

close #5848
2014-11-01 11:16:52 +01:00
Nobuo Kihara
c81e20b8e7 Merge branch 'master' of github.com:yiisoft/yii2 2014-11-01 18:53:11 +09:00
Qiang Xue
a094c739c8 minor doc fix [skip ci] 2014-10-31 23:01:38 -04:00
Nobuo Kihara
5c5c566cd8 Merge branch 'master' of github.com:yiisoft/yii2 2014-11-01 11:29:12 +09:00