jin-xinchen 858fdfb600 Update ngmodule.jade ...

中文原文：“这解决了在文件中使用指令_类型_时的冲突问题，但是还有另一个问题问题没有解决，我们将在[后面](#resolve-conflicts)讨论它。”
重复的”问题问题“

2017-04-16 19:42:11 +08:00

..

universal-img

docs(universal): add guide (#3378)

2017-03-31 17:20:59 +01:00

_data.json

Merge remote-tracking branch 'origin/master'

2017-04-15 15:34:47 +08:00

AngularCheatSheet_Letter.pdf

docs(cheatsheet): update for alpha-44

2015-10-20 01:26:36 +01:00

AngularCheatSheet_Poster.pdf

docs(cheatsheet): update for alpha-44

2015-10-20 01:26:36 +01:00

animations.jade

修订完animation

2017-04-15 18:56:22 +08:00

appmodule.jade

修订完appmodule

2017-04-15 18:59:35 +08:00

architecture.jade

修订完architecture

2017-04-15 19:02:32 +08:00

attribute-directives.jade

修订完attribute-directives

2017-04-15 21:03:04 +08:00

browser-support.jade

修订完browser-support

2017-04-15 21:03:37 +08:00

change-log.jade

翻译完change-log

2017-04-16 19:09:39 +08:00

cheatsheet-cn.json

Merge remote-tracking branch 'origin/master'

2017-02-26 15:39:42 +08:00

cheatsheet.jade

docs(cheatsheet): template -> ng-template (#3528)

2017-04-11 20:07:49 -07:00

cheatsheet.json

修订完toh1

2017-04-15 23:34:54 +08:00

component-styles.jade

手工应用jin-xinchen的patch

2017-04-16 19:17:19 +08:00

dependency-injection.jade

修订完style guide

2017-04-15 22:58:44 +08:00

deployment.jade

fix(guide): Message in dev mode has changed (#3439)

2017-04-11 20:20:32 -07:00

displaying-data.jade

修订完displaying data

2017-04-15 21:30:38 +08:00

forms.jade

Merge branch 'fix_guide_forms' of git://github.com/baiyangcao/angular-cn

2017-04-16 19:30:38 +08:00

glossary.jade

docs(glossary): general cleanup and fix links (#2100)

2016-08-17 17:50:42 -07:00

hierarchical-dependency-injection.jade

修订完hierarchical-DI

2017-04-15 21:36:40 +08:00

index.jade

修订完index

2017-04-15 21:38:27 +08:00

learning-angular.jade

Merge remote-tracking branch 'origin/master'

2017-04-15 15:34:47 +08:00

lifecycle-hooks.jade

Update lifecycle-hooks.jade

2017-04-16 19:11:10 +08:00

ngcontainer.jade

chore(aio): blank line before each list-item; - becomes * (#3481)

2017-04-01 00:25:27 +02:00

ngmodule.jade

Update ngmodule.jade

2017-04-16 19:42:11 +08:00

npm-packages.jade

修订完npm-packages

2017-04-15 21:56:49 +08:00

pipes.jade

修订完pipes

2017-04-15 22:05:07 +08:00

reactive-forms.jade

docs(reactive-forms): fix "Setup guide" link (#3517)

2017-04-11 19:23:34 -07:00

router.jade

修订完router

2017-04-15 22:15:28 +08:00

security.jade

修订完security

2017-04-15 22:33:30 +08:00

server-communication.jade

修订完server-communication

2017-04-15 22:39:40 +08:00

setup-systemjs-anatomy.jade

修订完setup-systemjs-anatomy

2017-04-15 22:42:11 +08:00

setup.jade

complete untranslated part of guid - setup.jade

2017-04-16 19:26:56 +08:00

structural-directives.jade

修订完structural directives

2017-04-15 22:50:09 +08:00

style-guide.jade

修订完style guide

2017-04-15 22:58:44 +08:00

template-syntax.jade

修订完testing

2017-04-15 23:19:41 +08:00

testing.jade

修订完testing

2017-04-15 23:19:41 +08:00

typescript-configuration.jade

Merge remote-tracking branch 'origin/master'

2017-04-15 15:34:47 +08:00

universal.md

chore(aio): blank line before each list-item; - becomes * (#3481)

2017-04-01 00:25:27 +02:00

upgrade.jade

修订完upgrade

2017-04-15 23:25:23 +08:00

user-input.jade

修正几个issue

2017-02-26 16:00:32 +08:00

webpack.jade

合并后微调

2017-04-16 19:36:34 +08:00