Zhicheng WANG
d17cf5f506
fix: 修订合并冲突
2019-06-07 14:00:45 +08:00
Zhicheng WANG
0fddc95118
Merge branch 'en-master' into aio
2019-06-07 12:29:04 +08:00
Zhicheng WANG
df222c3a12
fix: 修订完了 guide 部分
2019-06-04 21:48:02 +08:00
Zhicheng WANG
d5057aec3b
Merge remote-tracking branch 'en/master' into aio
2019-06-03 10:09:20 +08:00
Brandon
e1af6e3c70
docs: use dynamic import syntax in examples using lazy loading ( #30563 )
...
PR Close #30563
2019-05-21 09:09:35 -07:00
Richard Lea
d6538eb2fd
docs: fix naming miss and improve anchor reference in router guide ( #30225 )
...
Signed-off-by: Richard Lea <chigix@zoho.com>
PR Close #30225
2019-05-06 11:48:05 -07:00
Vani
ddb935fac7
docs: update examples region to match the description in the guide ( #29259 )
...
PR Close #29259
2019-04-02 16:09:19 -07:00
Kapunahele Wong
e8921365b7
docs: remove coremodule references ( #28434 )
...
PR Close #28434
2019-03-29 10:29:51 -07:00
Brandon Roberts
8ed13a37f0
docs: clarify commands to integrate routing ( #26530 )
...
PR Close #26530
2019-03-14 18:26:53 -04:00
Brandon
2064508876
docs: fix redirect with secondary outlet in router guide example ( #29267 )
...
The URL wasn't be parsed into a UrlTree, so redirecting with a
secondary route went to a 404
Closes #28805
PR Close #29267
2019-03-14 10:51:52 -04:00
Zhicheng WANG
b035e68480
Merge remote-tracking branch 'en/master' into aio
...
# Conflicts:
# .travis.yml
# aio/content/guide/aot-compiler.md
# aio/content/guide/architecture.md
# aio/content/guide/build.md
# aio/content/guide/dependency-injection-in-action.md
# aio/content/guide/deployment.md
# aio/content/guide/elements.md
# aio/content/guide/file-structure.md
# aio/content/guide/glossary.md
# aio/content/guide/hierarchical-dependency-injection.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/pipes.md
# aio/content/guide/router.md
# aio/content/guide/rx-library.md
# aio/content/guide/service-worker-communications.md
# aio/content/guide/service-worker-config.md
# aio/content/guide/singleton-services.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/universal.md
# aio/content/marketing/docs.md
# aio/content/marketing/features.html
# aio/content/tutorial/toh-pt0.md
# aio/content/tutorial/toh-pt6.md
# aio/package.json
# aio/src/app/layout/footer/footer.component.html
# aio/tools/transforms/templates/api/lib/memberHelpers.html
# aio/yarn.lock
# integration/cli-hello-world-ivy-minimal/src/polyfills.ts
# modules/benchmarks/e2e_test/largetable_perf.ts
# modules/benchmarks/e2e_test/largetable_spec.ts
# packages/animations/src/animation_metadata.ts
# packages/common/http/src/headers.ts
# packages/common/http/src/interceptor.ts
# packages/common/src/directives/ng_for_of.ts
# packages/common/src/directives/ng_if.ts
# packages/common/src/directives/ng_style.ts
# packages/common/src/directives/ng_switch.ts
# packages/core/src/change_detection/change_detection_util.ts
# packages/core/src/di/injectable.ts
# packages/core/src/interface/lifecycle_hooks.ts
# packages/core/src/linker/template_ref.ts
# packages/core/src/metadata/di.ts
# packages/core/src/metadata/directives.ts
# packages/core/src/metadata/ng_module.ts
# packages/core/src/render/api.ts
# packages/forms/src/form_providers.ts
# packages/forms/src/model.ts
# packages/router/src/config.ts
# packages/router/src/directives/router_link.ts
2019-02-17 00:00:16 +08:00
Zhicheng WANG
9ec21f77fd
fix: 精修翻译
2019-02-15 07:12:41 +08:00
Zhicheng WANG
56a017a977
fix: 精修翻译
2019-02-15 07:12:40 +08:00
Zhicheng WANG
421fc1a846
fix: 精修翻译
...
恢复一些过度省略的 "Angular"
Angular 模块恢复为 NgModule
2019-02-15 07:12:40 +08:00
Zhicheng WANG
d79fb401e7
fix: 修复一些翻译错误
2019-02-15 07:12:39 +08:00
Zhicheng WANG
c63a778e26
fix: 修复一些翻译错误
2019-02-15 07:12:39 +08:00
SebastienBtr
cb0a8b566f
docs(router): change slideInDownAnimation into slideInAnimation ( #28640 )
...
In the Routing & Navigation there is a typo - slideInDownAnimation, but it should be slideInAnimation
PR Close #28572
PR Close #28640
2019-02-13 12:03:45 -08:00
Brandon
1941d7c743
docs: ignore initial components for app compilation in router example ( #28592 )
...
PR Close #28592
2019-02-11 17:09:25 +00:00
Luiz Machado
1fb6731285
docs: fix crisis-detail milestone files ( #27025 )
...
Crisis Detail's template was being added two times and the component's TS none.
PR Close #27025
2019-01-22 11:19:51 -08:00
Hamza TEI
1df8be5573
docs: update link to post on redirects in router guide ( #27256 )
...
Change victor savkin's url post on redirects to:
http://vsavkin.tumblr.com/post/146722301646/angular-router-empty-paths-componentless-routes
PR Close #27256
2019-01-22 11:17:18 -08:00
Joseph Harrison-Lim
bccf8da35f
docs(router): fix misnamed path ( #27879 )
...
This change matches the routes found in the following code example
for auth.guard.ts as well as the login.component.1.ts in the "Add
the LoginComponent" section.
PR Close #27879
2019-01-10 17:06:05 -08:00
Michael De Wree
582395b8f5
docs: fix typo PageNotFoundCompponent ( #27799 )
...
closes : #27795
PR Close #27799
2019-01-09 12:42:39 -08:00
Zhicheng WANG
3e02cb65fc
fix: 翻译遗漏的内容
2019-01-04 15:43:45 +08:00
Zhicheng WANG
49fd2eb76d
fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译
2019-01-01 22:17:43 +08:00
loyayz
968f6a2337
fix: 翻译错误
2019-01-01 10:39:31 +08:00
Zhicheng WANG
8744f17f5d
Merge remote-tracking branch 'en/master' into aio
...
# Conflicts:
# aio/content/cli/index.md
# aio/content/file-not-found.md
# aio/content/guide/architecture-modules.md
# aio/content/guide/architecture-services.md
# aio/content/guide/build.md
# aio/content/guide/deployment.md
# aio/content/guide/elements.md
# aio/content/guide/feature-modules.md
# aio/content/guide/file-structure.md
# aio/content/guide/forms-overview.md
# aio/content/guide/glossary.md
# aio/content/guide/i18n.md
# aio/content/guide/npm-packages.md
# aio/content/guide/releases.md
# aio/content/guide/router.md
# aio/content/guide/service-worker-config.md
# aio/content/guide/service-worker-intro.md
# aio/content/guide/testing.md
# aio/content/guide/upgrade-performance.md
# aio/content/navigation.json
# aio/content/tutorial/toh-pt0.md
# aio/content/tutorial/toh-pt5.md
# aio/content/tutorial/toh-pt6.md
# aio/package.json
# aio/src/app/custom-elements/api/api-list.component.ts
# aio/src/app/documents/document.service.ts
# aio/src/app/layout/top-menu/top-menu.component.ts
# aio/src/index.html
# aio/src/styles/2-modules/_api-pages.scss
# aio/tools/transforms/templates/api/base.template.html
# aio/tools/transforms/templates/api/lib/memberHelpers.html
# aio/tools/transforms/templates/cli/cli-container.template.html
# aio/tools/transforms/templates/lib/githubLinks.html
# aio/yarn.lock
# packages/animations/src/animation_metadata.ts
# packages/common/http/src/backend.ts
# packages/common/http/src/client.ts
# packages/common/http/src/headers.ts
# packages/common/http/src/interceptor.ts
# packages/common/http/src/module.ts
# packages/common/http/src/params.ts
# packages/common/http/src/request.ts
# packages/common/http/src/response.ts
# packages/common/src/common_module.ts
# packages/common/src/directives/ng_class.ts
# packages/common/src/directives/ng_style.ts
# packages/common/src/directives/ng_switch.ts
# packages/common/src/i18n/format_date.ts
# packages/common/src/pipes/number_pipe.ts
# packages/core/src/change_detection/change_detection_util.ts
# packages/core/src/change_detection/pipe_transform.ts
# packages/core/src/di/injectable.ts
# packages/core/src/linker/element_ref.ts
# packages/core/src/linker/template_ref.ts
# packages/core/src/metadata/di.ts
# packages/core/src/metadata/directives.ts
# packages/core/src/metadata/lifecycle_hooks.ts
# packages/core/src/metadata/ng_module.ts
# packages/core/src/render/api.ts
# packages/forms/src/directives/form_interface.ts
# packages/forms/src/directives/ng_form.ts
# packages/forms/src/directives/ng_model.ts
# packages/forms/src/directives/reactive_directives/form_control_name.ts
# packages/forms/src/directives/select_control_value_accessor.ts
# packages/forms/src/directives/validators.ts
# packages/forms/src/form_builder.ts
# packages/forms/src/form_providers.ts
# packages/forms/src/model.ts
# packages/forms/src/validators.ts
# packages/platform-browser/src/browser.ts
# packages/platform-browser/src/security/dom_sanitization_service.ts
# packages/router/src/config.ts
# packages/router/src/events.ts
# packages/router/src/router.ts
# packages/router/src/router_module.ts
# packages/router/src/shared.ts
2018-12-29 16:04:37 +08:00
GuoYuFei
4b91f13228
fix:修正路由与导航章节的一个翻译错误
2018-12-24 20:52:21 +08:00
GuoYuFei
a0060abc70
fix: 修复路由与导航章节中的一个锚点跳转地址错误
2018-12-23 12:29:21 +08:00
GuoYuFei
2398b43e88
fix: 修复一句语意混乱的翻译错误
2018-12-23 12:28:51 +08:00
GuoYuFei
7758da5c1d
fix: 修复路由与导航章节中的一个参数名称错误
2018-12-23 12:28:51 +08:00
Zhicheng WANG
c25087ae06
fix: 遗漏的翻译
2018-12-20 09:56:09 +08:00
Zhicheng WANG
cf2d0b1a25
fix: 翻译错误 ( #346 )
2018-12-20 09:25:53 +08:00
GuoYuFei
47d4a6b1d2
fix:修复路由和导航章节中的一个表述错误
2018-12-20 09:22:16 +08:00
GuoYuFei
e40c0bae4b
fix:修复路由与导航章节的目录序号及格式
2018-12-17 22:19:34 +08:00
GuoYuFei
26376ab54f
fix: 修正翻译的一个语义错误
2018-12-12 00:32:26 +08:00
Jason Aden
4e9f2e5895
feat(router): guard returning UrlTree cancels current navigation and redirects ( #26521 )
...
Fixes #24618
FW-153 #resolve
PR Close #26521
2018-10-31 19:51:50 -04:00
GilBoom
28026cfc84
Update: router.md
...
修改翻译错误
2018-10-24 21:59:15 +08:00
Zhicheng Wang
9a0d3e9633
docs: 手动解决冲突
2018-10-22 18:16:47 +08:00
Zhicheng Wang
a9ac90d3df
Merge remote-tracking branch 'en/master' into aio
...
# Conflicts:
# aio/content/guide/ajs-quick-reference.md
# aio/content/guide/animations.md
# aio/content/guide/aot-compiler.md
# aio/content/guide/architecture-components.md
# aio/content/guide/architecture-modules.md
# aio/content/guide/architecture-next-steps.md
# aio/content/guide/architecture-services.md
# aio/content/guide/architecture.md
# aio/content/guide/attribute-directives.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/cheatsheet.md
# aio/content/guide/comparing-observables.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/dynamic-component-loader.md
# aio/content/guide/elements.md
# aio/content/guide/feature-modules.md
# aio/content/guide/form-validation.md
# aio/content/guide/forms.md
# aio/content/guide/glossary.md
# aio/content/guide/hierarchical-dependency-injection.md
# aio/content/guide/i18n.md
# aio/content/guide/lazy-loading-ngmodules.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule-vs-jsmodule.md
# aio/content/guide/ngmodules.md
# aio/content/guide/npm-packages.md
# aio/content/guide/observables-in-angular.md
# aio/content/guide/observables.md
# aio/content/guide/pipes.md
# aio/content/guide/practical-observable-usage.md
# aio/content/guide/providers.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/router.md
# aio/content/guide/rx-library.md
# aio/content/guide/security.md
# aio/content/guide/service-worker-communications.md
# aio/content/guide/service-worker-getting-started.md
# aio/content/guide/service-worker-intro.md
# aio/content/guide/setup-systemjs-anatomy.md
# aio/content/guide/setup.md
# aio/content/guide/singleton-services.md
# aio/content/guide/structural-directives.md
# aio/content/guide/styleguide.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/universal.md
# aio/content/guide/updating.md
# aio/content/guide/upgrade.md
# aio/content/guide/user-input.md
# aio/content/guide/visual-studio-2015.md
# aio/content/marketing/docs.md
# aio/content/navigation.json
# aio/content/tutorial/toh-pt0.md
# aio/content/tutorial/toh-pt1.md
# aio/content/tutorial/toh-pt2.md
# aio/content/tutorial/toh-pt3.md
# aio/content/tutorial/toh-pt4.md
# aio/content/tutorial/toh-pt5.md
# aio/content/tutorial/toh-pt6.md
# aio/ngsw-manifest.json
# aio/package.json
# aio/src/app/custom-elements/api/api-list.component.html
# aio/src/app/custom-elements/api/api-list.component.ts
# aio/src/index.html
# aio/tools/transforms/templates/api/base.template.html
# aio/tools/transforms/templates/api/class.template.html
# aio/tools/transforms/templates/api/directive.template.html
# aio/tools/transforms/templates/api/enum.template.html
# aio/tools/transforms/templates/api/includes/class-overview.html
# aio/tools/transforms/templates/api/includes/deprecation.html
# aio/tools/transforms/templates/api/includes/export-as.html
# aio/tools/transforms/templates/api/includes/info-bar.html
# aio/tools/transforms/templates/api/includes/interface-overview.html
# aio/tools/transforms/templates/api/includes/selectors.html
# aio/tools/transforms/templates/api/lib/directiveHelpers.html
# aio/tools/transforms/templates/api/lib/githubLinks.html
# aio/tools/transforms/templates/api/lib/memberHelpers.html
# aio/tools/transforms/templates/api/package.template.html
# aio/yarn.lock
# packages/common/http/src/module.ts
# packages/common/src/common_module.ts
# packages/common/src/directives/ng_for_of.ts
# packages/common/src/directives/ng_if.ts
# packages/common/src/directives/ng_template_outlet.ts
# packages/common/src/location/location.ts
# packages/common/src/pipes/async_pipe.ts
# packages/common/src/pipes/json_pipe.ts
# packages/common/src/pipes/number_pipe.ts
# packages/common/src/pipes/slice_pipe.ts
# packages/core/src/change_detection/change_detector_ref.ts
# packages/core/src/di/injectable.ts
# packages/core/src/linker/template_ref.ts
# packages/core/src/linker/view_container_ref.ts
# packages/core/src/metadata/di.ts
# packages/core/src/metadata/ng_module.ts
# packages/core/src/render/api.ts
# packages/forms/src/directives/form_interface.ts
# packages/forms/src/directives/ng_form.ts
# packages/forms/src/directives/ng_model.ts
# packages/forms/src/directives/reactive_directives/form_control_name.ts
# packages/forms/src/directives/select_control_value_accessor.ts
# packages/forms/src/directives/validators.ts
# packages/forms/src/form_providers.ts
# packages/forms/src/model.ts
# packages/forms/src/validators.ts
# packages/router/src/config.ts
# packages/router/src/router.ts
# packages/router/src/router_module.ts
# packages/router/src/router_state.ts
2018-10-21 17:43:29 +08:00
jenniferfell
0ef1f7ef0d
docs: change links to cli wiki to link to new aio docs files m to z ( #26492 )
...
PR Close #26492
2018-10-17 11:06:07 -07:00
William Marques
fc6dad40ac
fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips ( #26396 )
...
Closes #26174
PR Close #26396
2018-10-17 11:05:29 -07:00
Zhicheng Wang
e68ce8cd23
fix: typo
2018-10-09 17:17:42 +08:00
Atuuh
3683c6a188
docs: fix wording ( #26207 )
...
fix wording to sound better
PR Close #26207
2018-10-05 14:19:08 -07:00
Brandon Roberts
bc88f318f6
docs: update routing integration section based on feedback ( #20023 )
...
PR Close #20023
2018-09-26 10:14:49 -07:00
Brandon Roberts
a5b7008c8e
docs: add section on router integration ( #20023 )
...
PR Close #20023
2018-09-26 10:14:49 -07:00
Brandon Roberts
ac5aa8f46d
docs: router guide review feedback changes ( #20023 )
...
PR Close #20023
2018-09-26 10:14:49 -07:00
Brandon Roberts
1fb3c4ffee
docs: Update router guide to use Angular CLI ( #20023 )
...
PR Close #20023
2018-09-26 10:14:49 -07:00
Brandon Roberts
3c8aa0b301
docs: Refresh content on routable animations for router guide ( #20023 )
...
PR Close #20023
2018-09-26 10:14:49 -07:00
Eve
dbcc55f386
fix:错别字及语法
2018-08-24 09:16:48 +08:00
Zhicheng Wang
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
