Commit Graph

7892 Commits

Author SHA1 Message Date
Mark
64deaad75d undo changes 2014-06-14 21:59:10 +04:00
Qiang Xue
5034a32235 Merge pull request #3872 from SuperPuppet/patch-1
Create db-active-record.md
2014-06-14 12:09:49 -04:00
Qiang Xue
96e6a9b621 Merge pull request #3873 from SuperPuppet/patch-2
Create db-dao.md
2014-06-14 12:08:50 -04:00
SuperPuppet
15c93b197b Create db-dao.md
暂未校对
2014-06-15 00:03:19 +08:00
SuperPuppet
86e8d252d0 Create db-active-record 2014-06-14 23:59:45 +08:00
Olivers De Abreu
8dd5d1446e Fix mantain the code in english for start-hello.md
Spanish translation of start-forms.md
2014-06-14 11:50:29 -04:00
Qiang Xue
baae3e8ea1 Merge pull request #3867 from riverlet/zh-CN-translate-0604
Chinese guide
2014-06-14 11:20:58 -04:00
Riverlet
7fc925f631 translated 2014-06-14 18:37:54 +08:00
Riverlet
f3df8afd19 translated 2014-06-14 18:24:17 +08:00
Riverlet
35eea62c70 Merge branch 'master' of https://github.com/yiisoft/yii2 2014-06-14 17:44:11 +08:00
Riverlet
c15a5a1f8b translated 2014-06-14 17:36:35 +08:00
Mark
52283616a1 updated CHANGELOG line 2014-06-14 13:16:23 +04:00
Mark
1a3c04e0d2 fixed tests 2014-06-14 13:14:36 +04:00
Mark
42643e3747 type validation adjusted 2014-06-14 12:42:12 +04:00
Riverlet
47e2ba493f translating.. 2014-06-14 16:22:22 +08:00
Riverlet
2971df8313 translated. 2014-06-14 16:01:00 +08:00
Riverlet
1f102b270c Merge remote-tracking branch 'origin/master'
Conflicts:
	docs/guide-zh-CN/intro-yii.md
2014-06-14 15:25:01 +08:00
Riverlet
a30847d535 translated. 2014-06-14 15:20:42 +08:00
Riverlet
820b5828cf translated. 2014-06-14 15:15:08 +08:00
riverlet
dcb5c771f5 translate 2014-06-14 13:26:56 +08:00
Qiang Xue
604b464ead Merge branch 'creocoder-widgets-activeform-incorrect-js-selector' 2014-06-13 22:02:02 -04:00
Qiang Xue
0740d2da61 Merge branch 'widgets-activeform-incorrect-js-selector' of github.com:creocoder/yii2 into creocoder-widgets-activeform-incorrect-js-selector
Conflicts:
	framework/CHANGELOG.md
2014-06-13 22:01:47 -04:00
Qiang Xue
a6d4fc83c0 Merge pull request #3864 from creocoder/yii-bootstrap-bootstrapthemeasset-comment-fix
BootstrapThemeAsset comment fix
2014-06-13 21:54:14 -04:00
Alexander Kochetov
6809b18cca BootstrapThemeAsset comment fix 2014-06-14 03:48:55 +04:00
Alexander Kochetov
1b81503d71 \yii\widgets\ActiveForm incorrect js selector for errorSummaryCss property better fix 2014-06-14 02:02:35 +04:00
Alexander Kochetov
24239e4205 CHANGELOG updated 2014-06-14 01:30:30 +04:00
Alexander Kochetov
4894d66d6e \yii\widgets\ActiveForm incorrect js selector for errorSummaryCss property fixed 2014-06-14 01:28:16 +04:00
Kevin LEVRON
67b6522c9d French start-installation.md (wip) [skip ci] 2014-06-13 22:15:22 +02:00
Alexander Makarov
27bfb4f28e Merge pull request #3857 from Ragazzo/docs_structure_applications
structure applications guide translated
2014-06-14 00:01:53 +04:00
Alexander Makarov
f0b5ea7f01 Merge pull request #3860 from klevron/french-doc
French intro-upgrade-from-v1
2014-06-13 23:57:57 +04:00
Alexander Makarov
80d2d64247 Merge pull request #3861 from klevron/temp
Fix links [skip ci]
2014-06-13 23:57:33 +04:00
Alexander Makarov
e84a2dfbb0 Merge pull request #3862 from oliversd/master
Spanish traduction for start-hello.md guide
2014-06-13 23:56:58 +04:00
Olivers De Abreu
bbb829845e Copy image start-hello-world.png to folder guide-es/images 2014-06-13 15:53:34 -04:00
Kevin LEVRON
53d6e0cead Fix link [skip ci] 2014-06-13 21:44:22 +02:00
Kevin LEVRON
b73109593a Fix links [skip ci] 2014-06-13 21:21:47 +02:00
Carsten Brandt
dfbe233d70 Merge branch 'temp' of https://github.com/klevron/yii2
* 'temp' of https://github.com/klevron/yii2:
  Links fix [skip ci]
  Models link fix [skip ci]
  Install link fix [skip ci]

Conflicts:
	docs/guide/intro-upgrade-from-v1.md
2014-06-13 21:19:30 +02:00
Olivers De Abreu
fb506018fd Typo fix 2014-06-13 14:59:33 -04:00
Olivers De Abreu
e2bab0c1f3 Spanish start-hello.md guide 2014-06-13 14:55:36 -04:00
Kevin LEVRON
a1d6b98125 Fix links [skip ci] 2014-06-13 20:39:48 +02:00
Kevin LEVRON
3ffe3d0640 Links fix [skip ci] 2014-06-13 20:38:41 +02:00
Kevin LEVRON
0813d132b7 Models link fix [skip ci] 2014-06-13 20:33:31 +02:00
Kevin LEVRON
5a2cd83f9f Install link fix [skip ci] 2014-06-13 20:28:08 +02:00
Kevin LEVRON
8fc14a8a62 Update intro-upgrade-from-v1.md 2014-06-13 20:16:37 +02:00
Carsten Brandt
98be88c704 Merge pull request #3858 from klevron/temp
Fix typo [skip ci]
2014-06-13 19:24:32 +02:00
Kevin LEVRON
8899685bc0 Fix typo [skip ci] 2014-06-13 19:00:16 +02:00
Mark
720bf341a4 structure applications guide translated 2014-06-13 19:32:51 +04:00
Kevin LEVRON
d706225a6e French intro-upgrade-from-v1 (wip) [skip ci] 2014-06-13 17:21:46 +02:00
Qiang Xue
10af398dfc Merge pull request #3856 from klevron/temp
Fix assets links [skip ci]
2014-06-13 10:59:57 -04:00
Kevin LEVRON
0a14f30880 Fix assets links [skip ci] 2014-06-13 16:57:45 +02:00
Kevin LEVRON
8f2679d08f French intro-upgrade-from-v1 (wip) [skip ci] 2014-06-13 16:50:12 +02:00