Zhicheng Wang a6df16f891 Merge branch 'master' into aio ...

# Conflicts:
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/reactive-forms.md
#	aio/content/marketing/index.html
#	aio/content/navigation.json
#	aio/src/environments/environment.stable.ts

2017-08-08 13:10:17 +08:00

..

ajs-quick-reference.md

fix: use new translation logic

2017-08-06 13:37:25 +08:00

animations.md

fix: some untranslated english

2017-08-06 13:21:34 +08:00

aot-compiler.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

architecture.md

clean: remove useless codes

2017-08-06 13:42:51 +08:00

attribute-directives.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

bootstrapping.md

fix: some untranslated english

2017-08-06 13:21:34 +08:00

browser-support.md

fix: use new translation logic

2017-08-06 13:37:25 +08:00

change-log.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

cheatsheet.md

Merge remote-tracking branch 'en/master' into aio

2017-07-30 00:09:50 +08:00

component-interaction.md

fix: a back to top link

2017-08-04 09:10:22 +08:00

component-styles.md

fix: some untranslated english

2017-08-06 13:21:34 +08:00

dependency-injection-in-action.md

fix: translate all pure english titles

2017-08-04 14:06:15 +08:00

dependency-injection.md

fix: translate all pure english titles

2017-08-04 14:06:15 +08:00

deployment.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

displaying-data.md

fix: minor improvements

2017-07-30 17:40:53 +08:00

docs-style-guide.md

docs: shefali edits to Authors Style Guide (#17853)

2017-07-05 14:33:06 -07:00

dynamic-component-loader.md

fix: some untranslated english

2017-08-06 13:21:34 +08:00

dynamic-form.md

fix: some untranslated english

2017-08-06 13:21:34 +08:00

form-validation.md

Merge branch 'master' into aio

2017-08-08 13:10:17 +08:00

forms.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

glossary.md

clean: remove useless codes

2017-08-06 13:42:51 +08:00

hierarchical-dependency-injection.md

Merge remote-tracking branch 'en/master' into aio

2017-07-30 00:09:50 +08:00

http.md

fix: translated http-client

2017-08-05 22:32:31 +08:00

i18n.md

Merge branch 'master' into aio

2017-08-08 13:10:17 +08:00

language-service.md

fix: minor improvement

2017-08-06 08:06:53 +08:00

lifecycle-hooks.md

fix: translate all pure english titles

2017-08-04 14:06:15 +08:00

ngmodule-faq.md

fix: use new translation logic

2017-08-06 13:37:25 +08:00

ngmodule.md

clean: remove useless codes

2017-08-06 13:42:51 +08:00

npm-packages.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

pipes.md

fix: many of broken links

2017-07-30 12:32:56 +08:00

quickstart.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

reactive-forms.md

fix: translate all pure english titles

2017-08-04 14:06:15 +08:00

router.md

fix: 修正在线例子的链接

2017-08-07 08:10:17 +08:00

security.md

clean: remove useless codes

2017-08-06 13:42:51 +08:00

set-document-title.md

fix: many of broken links

2017-07-30 12:32:56 +08:00

setup-systemjs-anatomy.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

setup.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

structural-directives.md

fix: translate the rest of structural directives

2017-08-06 14:08:44 +08:00

styleguide.md

fix: all "back to top" links

2017-07-30 22:18:19 +08:00

template-syntax.md

fix: translated the rest of template-syntax

2017-08-05 12:47:14 +08:00

testing.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

ts-to-js.md

fix: missing break lines

2017-08-05 22:47:21 +08:00

typescript-configuration.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

upgrade.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

user-input.md

Merge remote-tracking branch 'en/master' into aio

2017-07-30 00:09:50 +08:00

visual-studio-2015.md

fix: 快速起步改为快速上手

2017-08-07 07:49:44 +08:00

webpack.md

fix: translate all pure english titles

2017-08-04 14:06:15 +08:00