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
Kapunahele Wong
0926119977
docs: add explanation on what lazy loading is ( #29667 )
...
PR Close #29667
2019-05-06 10:16:58 -07:00
Kapunahele Wong
e8921365b7
docs: remove coremodule references ( #28434 )
...
PR Close #28434
2019-03-29 10:29:51 -07:00
javatutorials2016
fea2a0f2ac
docs: update Shortcut keys for Developer tools in chrome Browser on Windows machine ( #29485 )
...
PR Close #29485
2019-03-27 09:41:39 -07:00
javatutorials2016
e0dcd11a49
docs: update Shortcut keys for Developer tools in chrome Browser on Windows platform ( #29485 )
...
PR Close #29485
2019-03-27 09:41:39 -07: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
Siddharth Ajmera
665627e254
fix(aio): add relative to app level routes section ( #26504 )
...
Added word *relative* to the **Routes at the app level** section description. This was not specified before. The routes in the *lazy-loading-ngmodules/src/app/app-routing.module.ts* also had `loadChildren` values starting with `app/...`.
The code for `app-routing.module.ts` is already fixed in [this commit](67ad9468d3Close #26504
2018-10-17 13:11:42 -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
e167fa5229
refactor: 重构自动翻译代码
2018-03-24 20:03:10 +08:00
Zhicheng Wang
6c3d57aee9
fix: 合并了最新版本
2018-03-24 13:12:42 +08:00
Zhicheng Wang
2b6e7c8ca1
feat: 翻译完了 NgModule 部分
2018-03-21 14:02:05 +08:00
Zhicheng Wang
e0fc873240
fix: minor fix and auto translate based on previous result
2018-03-18 07:44:33 +08:00
Zhicheng Wang
0e0ffa481e
fix: 修正自动翻译结果
2018-03-07 11:25:56 +08:00
Zhicheng Wang
206f6ecc4f
fix: 修正最后一版的全部翻译
2018-03-04 09:07:33 +08:00
George Kalpakas
81e87095b4
docs: several minor NgModule guide fixes/improvements ( #21589 )
...
PR Close #21589
2018-01-18 18:22:20 -06:00
Kapunahele Wong
e79e98ab44
docs: fix lazy loading example dir name ( #21475 )
...
PR Close #21475
2018-01-17 17:02:41 -08:00
Kapunahele Wong
53f91189a1
docs(aio): add NgModule docs ( #20306 )
...
PR Close #20306
2018-01-10 16:26:46 -08:00
