jin-xinchen
|
858fdfb600
|
Update ngmodule.jade
中文原文：“这解决了在文件中使用指令_类型_时的冲突问题，但是还有另一个问题问题没有解决，我们将在[后面](#resolve-conflicts)讨论它。”
重复的”问题问题“
|
2017-04-16 19:42:11 +08:00 |
Zhicheng Wang
|
eb4fc40c51
|
merge
|
2017-04-16 19:41:34 +08:00 |
|
Zhicheng Wang
|
bbf53e66f7
|
merge
|
2017-04-16 19:40:22 +08:00 |
|
Zhicheng Wang
|
011606fa1f
|
合并后微调
|
2017-04-16 19:36:34 +08:00 |
|
Zhicheng Wang
|
44433258bb
|
Merge branch 'patch-1' of git://github.com/jin-xinchen/angular-cn
# Conflicts:
# public/docs/ts/latest/tutorial/toh-pt6.jade
|
2017-04-16 19:35:38 +08:00 |
|
Zhicheng Wang
|
ffabcb6241
|
Merge branch 'master' of git://github.com/tkisme/angular-cn
# Conflicts:
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
|
2017-04-16 19:34:15 +08:00 |
|
Zhicheng Wang
|
a13dfe9276
|
Merge branch 'fix_guide_forms' of git://github.com/baiyangcao/angular-cn
# Conflicts:
# public/docs/ts/latest/guide/forms.jade
|
2017-04-16 19:30:38 +08:00 |
baiyangcao
|
ec19287654
|
complete untranslated part of guid - setup.jade
|
2017-04-16 19:26:56 +08:00 |
|
Zhicheng Wang
|
c48406cb9f
|
Merge branch 'fix_toh_pt6' of git://github.com/baiyangcao/angular-cn
# Conflicts:
# public/docs/ts/latest/tutorial/toh-pt6.jade
|
2017-04-16 19:25:56 +08:00 |
|
Zhicheng Wang
|
458da034e8
|
手工应用jin-xinchen的patch
|
2017-04-16 19:17:19 +08:00 |
|
Zhicheng Wang
|
a309bb91f6
|
手工应用jin-xinchen的patch
|
2017-04-16 19:16:05 +08:00 |
|
jin-xinchen
|
7d10481417
|
Update lifecycle-hooks.jade
|
2017-04-16 19:11:10 +08:00 |
|
Zhicheng Wang
|
2b33a27f85
|
翻译完change-log
|
2017-04-16 19:09:39 +08:00 |
|
Zhicheng Wang
|
c8900075a2
|
修订完presskit
|
2017-04-16 19:01:15 +08:00 |
|
Zhicheng Wang
|
b7de02f84f
|
修订完glossary
|
2017-04-16 18:41:03 +08:00 |
|
Zhicheng Wang
|
ed206e74a7
|
修订完cli-quickstart
|
2017-04-16 18:30:54 +08:00 |
|
Zhicheng Wang
|
409e17fab4
|
修订完toh6
|
2017-04-16 18:22:16 +08:00 |
|
Zhicheng Wang
|
b7b93abd71
|
修订完toh5
|
2017-04-16 18:10:20 +08:00 |
|
Zhicheng Wang
|
90f58a8b4c
|
修订完toh4
|
2017-04-16 17:04:44 +08:00 |
|
Zhicheng Wang
|
5561073842
|
修订完toh3
|
2017-04-16 17:00:21 +08:00 |
|
Zhicheng Wang
|
866238ffca
|
修订完toh2
|
2017-04-16 16:56:40 +08:00 |
|
Zhicheng Wang
|
30931c9b2f
|
修订完toh1
|
2017-04-15 23:34:54 +08:00 |
|
Zhicheng Wang
|
cf546a7f45
|
修订完webpack
|
2017-04-15 23:31:14 +08:00 |
|
Zhicheng Wang
|
7a0137d5a5
|
修订完upgrade
|
2017-04-15 23:25:23 +08:00 |
|
Zhicheng Wang
|
04c77dc05a
|
修订完testing
|
2017-04-15 23:19:41 +08:00 |
|
Zhicheng Wang
|
4b7daad85b
|
修订完style guide
|
2017-04-15 22:58:44 +08:00 |
|
Zhicheng Wang
|
8b003d4015
|
修订完structural directives
|
2017-04-15 22:50:09 +08:00 |
|
Zhicheng Wang
|
32718328dc
|
修订完setup-systemjs-anatomy
|
2017-04-15 22:42:11 +08:00 |
|
Zhicheng Wang
|
b7869884c4
|
修正一个编译错误
|
2017-04-15 22:41:14 +08:00 |
|
Zhicheng Wang
|
a50bf1832e
|
修订完server-communication
|
2017-04-15 22:39:40 +08:00 |
|
Zhicheng Wang
|
70e77a29ef
|
修订完security
|
2017-04-15 22:33:30 +08:00 |
lizhonghui
|
0ce88ece13
|
fix(webpack): translation optimize
(cherry picked from commit a3364d8)
|
2017-04-15 22:27:46 +08:00 |
|
lizhonghui
|
8fdfdf5d1a
|
fix(webpack): complete untranslated part of webpack chapter
(cherry picked from commit 48c9d68)
|
2017-04-15 22:26:51 +08:00 |
|
Zhicheng Wang
|
9db69011c3
|
修订完router
|
2017-04-15 22:15:28 +08:00 |
|
Zhicheng Wang
|
5f20e0ce45
|
修订完pipes
|
2017-04-15 22:05:07 +08:00 |
|
Zhicheng Wang
|
6383abb6b3
|
修订完npm-packages
|
2017-04-15 21:56:49 +08:00 |
|
Zhicheng Wang
|
7a8d65353b
|
修订完ngmodules
|
2017-04-15 21:54:53 +08:00 |
|
Zhicheng Wang
|
7e81cc60d9
|
修订完lifecycle-hooks
|
2017-04-15 21:46:13 +08:00 |
|
Zhicheng Wang
|
a1c811f763
|
修订完index
|
2017-04-15 21:38:27 +08:00 |
|
Zhicheng Wang
|
d33efdab08
|
修订完hierarchical-DI
|
2017-04-15 21:36:40 +08:00 |
|
Zhicheng Wang
|
116308caa2
|
修订完forms
|
2017-04-15 21:34:03 +08:00 |
|
Zhicheng Wang
|
81dd3a76cf
|
修订完displaying data
|
2017-04-15 21:30:38 +08:00 |
|
Zhicheng Wang
|
e12b29a434
|
修订完DI
|
2017-04-15 21:27:07 +08:00 |
|
Zhicheng Wang
|
8eff508115
|
修订完component-styles
|
2017-04-15 21:12:54 +08:00 |
|
Zhicheng Wang
|
b83320c3da
|
修订完change-log
|
2017-04-15 21:06:34 +08:00 |
|
Zhicheng Wang
|
bddd8a818d
|
修订完browser-support
|
2017-04-15 21:03:37 +08:00 |
|
Zhicheng Wang
|
2a313651d2
|
修订完attribute-directives
|
2017-04-15 21:03:04 +08:00 |
|
Zhicheng Wang
|
ab9cd412e6
|
修订完architecture
|
2017-04-15 19:02:32 +08:00 |
|
Zhicheng Wang
|
61c50048ea
|
修订完appmodule
|
2017-04-15 18:59:35 +08:00 |
|
Zhicheng Wang
|
0a803ec991
|
修订完animation
|
2017-04-15 18:56:22 +08:00 |