966a29e072
fix: 修正合并时的错误
2018-07-27 20:22:07 +08:00
2d485c6589
Merge remote-tracking branch 'en/master' into aio
...
# Conflicts:
# aio/content/guide/animations.md
# aio/content/guide/aot-compiler.md
# aio/content/guide/api-page-class.md
# aio/content/guide/architecture-components.md
# aio/content/guide/architecture-modules.md
# aio/content/guide/architecture-services.md
# aio/content/guide/architecture.md
# aio/content/guide/attribute-directives.md
# aio/content/guide/browser-support.md
# aio/content/guide/component-interaction.md
# aio/content/guide/component-styles.md
# aio/content/guide/dependency-injection-in-action.md
# aio/content/guide/dependency-injection-pattern.md
# aio/content/guide/dependency-injection.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/elements.md
# aio/content/guide/form-validation.md
# aio/content/guide/forms.md
# aio/content/guide/frequent-ngmodules.md
# aio/content/guide/glossary.md
# aio/content/guide/hierarchical-dependency-injection.md
# aio/content/guide/http.md
# aio/content/guide/i18n.md
# aio/content/guide/language-service.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-api.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/npm-packages.md
# aio/content/guide/observables.md
# aio/content/guide/pipes.md
# aio/content/guide/providers.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/releases.md
# aio/content/guide/router.md
# aio/content/guide/rx-library.md
# aio/content/guide/security.md
# aio/content/guide/service-worker-config.md
# aio/content/guide/service-worker-getting-started.md
# aio/content/guide/set-document-title.md
# aio/content/guide/setup.md
# aio/content/guide/structural-directives.md
# aio/content/guide/styleguide.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing-observables.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/universal.md
# aio/content/guide/upgrade.md
# aio/content/guide/user-input.md
# aio/content/guide/visual-studio-2015.md
# aio/content/guide/webpack.md
# aio/content/marketing/resources.json
# aio/content/navigation.json
# aio/content/tutorial/toh-pt0.md
# aio/content/tutorial/toh-pt1.md
# aio/content/tutorial/toh-pt4.md
# aio/content/tutorial/toh-pt5.md
# aio/content/tutorial/toh-pt6.md
# aio/src/app/custom-elements/api/api-list.component.ts
# aio/src/app/custom-elements/live-example/live-example.component.html
# aio/src/app/custom-elements/live-example/live-example.component.ts
# aio/src/app/layout/doc-viewer/doc-viewer.component.ts
# aio/src/styles/main.scss
# aio/tools/transforms/remark-package/services/renderMarkdown.js
2018-07-27 10:51:18 +08:00
bb58138579
docs: fix bad link ( #24825 )
...
PR Close #24825
2018-07-20 11:34:38 -07:00
0d6b74dd87
docs: fix typo in component architecture guide ( #24832 )
...
Change the sentence from 'this tells Angular how provide ...' to 'this tells Angular how to provide ...'. The current sentence does not make grammatical sense.
PR Close #24832
2018-07-12 14:31:27 -04:00
49df4ef454
docs: add tree-shakable providers ( #24481 )
...
PR Close #24481
2018-07-10 11:12:07 -07:00
e1146f3d06
docs: clarify wording in architecture overview ( #24481 )
...
Closes #23463
Closes #22158
PR Close #24481
2018-07-10 11:12:07 -07:00
77a2381d0a
fix: sync to 6.0(WIP)
2018-05-07 13:06:47 +08:00
896811df64
docs(aio): add missing word in the Component metadata section ( #23384 )
...
PR Close #23384
2018-04-15 23:36:55 -07:00
b433d2148c
fix: change some angular.io to angular.cn
2018-03-26 16:34:57 +08:00
01ed628717
feat: 翻译完了 architecture-components 和 architecture-modules
2018-03-25 12:36:17 +08:00
6c3d57aee9
fix: 合并了最新版本
2018-03-24 13:12:42 +08:00
02e6ac2117
docs: incorporate suggestions and corrections from gkalpak ( #21569 )
...
PR Close #21569
2018-03-15 14:48:35 -07:00
04ca77e38e
docs(aio): update architecture section ( #21569 )
...
PR Close #21569
2018-03-15 14:48:35 -07:00
Zhicheng Wang
Judy Bogart
Arun Kumar
systemallica