YuCheng Hu
895f2fe818
针对新的版本提交没有提交的代码
2021-04-03 09:52:53 -04:00
Zhicheng WANG
d4b884fe17
Merge remote-tracking branch 'en/master' into aio
...
# Conflicts:
# aio/content/cli/index.md
# aio/content/guide/accessibility.md
# aio/content/guide/ajs-quick-reference.md
# aio/content/guide/angular-compiler-options.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/attribute-directives.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/cli-builder.md
# aio/content/guide/comparing-observables.md
# aio/content/guide/component-styles.md
# aio/content/guide/creating-libraries.md
# aio/content/guide/dependency-injection-in-action.md
# aio/content/guide/dependency-injection-navtree.md
# aio/content/guide/dependency-injection-providers.md
# aio/content/guide/dependency-injection.md
# aio/content/guide/deployment.md
# aio/content/guide/deprecations.md
# aio/content/guide/displaying-data.md
# aio/content/guide/dynamic-component-loader.md
# aio/content/guide/elements.md
# aio/content/guide/file-structure.md
# aio/content/guide/glossary.md
# aio/content/guide/http.md
# aio/content/guide/i18n.md
# aio/content/guide/ivy-compatibility.md
# aio/content/guide/language-service.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/module-types.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule-vs-jsmodule.md
# aio/content/guide/ngmodules.md
# aio/content/guide/observables-in-angular.md
# aio/content/guide/pipes.md
# aio/content/guide/providers.md
# aio/content/guide/releases.md
# aio/content/guide/route-animations.md
# aio/content/guide/router-tutorial.md
# aio/content/guide/router.md
# aio/content/guide/rx-library.md
# aio/content/guide/schematics-authoring.md
# aio/content/guide/schematics-for-libraries.md
# aio/content/guide/service-worker-config.md
# aio/content/guide/service-worker-getting-started.md
# aio/content/guide/structural-directives.md
# aio/content/guide/styleguide.md
# aio/content/guide/template-syntax.md
# aio/content/guide/template-typecheck.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/upgrade-setup.md
# aio/content/guide/user-input.md
# aio/content/guide/using-libraries.md
# aio/content/guide/web-worker.md
# aio/content/guide/workspace-config.md
# aio/content/marketing/docs.md
# aio/content/marketing/events.html
# aio/content/navigation.json
# aio/content/start/index.md
# aio/content/start/start-data.md
# aio/content/start/start-deployment.md
# aio/content/tutorial/toh-pt2.md
# aio/content/tutorial/toh-pt4.md
# aio/package.json
# aio/src/app/app.component.ts
# aio/src/app/layout/footer/footer.component.html
# aio/src/app/shared/custom-icon-registry.ts
# aio/src/environments/environment.stable.ts
# aio/tools/stackblitz-builder/builder.js
# aio/tools/transforms/angular-content-package/index.js
# aio/tools/transforms/templates/api/lib/memberHelpers.html
# aio/yarn.lock
# integration/ng_elements/e2e/app.e2e-spec.ts
# integration/ng_elements/src/app.ts
# packages/common/src/pipes/date_pipe.ts
# packages/core/src/metadata/directives.ts
# packages/core/src/metadata/ng_module.ts
# packages/core/src/render/api.ts
# packages/forms/src/directives/ng_model.ts
# packages/forms/src/form_builder.ts
# packages/forms/src/model.ts
# packages/platform-browser/src/browser.ts
# packages/router/src/config.ts
# packages/router/src/directives/router_link.ts
# packages/router/src/directives/router_link_active.ts
# packages/router/src/events.ts
# packages/router/src/router.ts
# packages/router/src/router_module.ts
# packages/router/src/router_state.ts
2020-12-04 20:22:11 +08:00
Marcono1234
3e1e5a15ba
docs: update links to use HTTPS as protocol ( #39718 )
...
PR Close #39718
2020-11-20 12:52:16 -08:00
David Shevitz
bc69182bdd
docs: Migrate section, view encapsulation, from Component Styles topic into its own topic. ( #38986 )
...
PR Close #38986
2020-10-05 13:23:41 -07:00
Joey Perrott
86e7cd8117
docs: correct link to chrome status in component style guide ( #38682 )
...
Corrects the link to the chromestatus page which errantly linked to features
rather than feature (singular).
Fixes #38676
PR Close #38682
2020-09-02 14:45:20 -07:00
Zhicheng WANG
8675bc5719
docs: 合并远端更新
...
初步合并了冲突，尚未校验，四个改动很大的章节暂时改回了英文版
2020-06-12 18:18:15 +08:00
Zhicheng WANG
8663fa04a8
Merge remote-tracking branch 'en/master' into aio
...
# Conflicts:
# .nvmrc
# aio/content/cli/index.md
# aio/content/guide/ajs-quick-reference.md
# aio/content/guide/animations.md
# aio/content/guide/aot-compiler.md
# aio/content/guide/app-shell.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/bazel.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/build.md
# aio/content/guide/cheatsheet.md
# aio/content/guide/cli-builder.md
# aio/content/guide/comparing-observables.md
# aio/content/guide/complex-animation-sequences.md
# aio/content/guide/component-interaction.md
# aio/content/guide/component-styles.md
# aio/content/guide/creating-libraries.md
# aio/content/guide/dependency-injection-in-action.md
# aio/content/guide/dependency-injection-navtree.md
# aio/content/guide/dependency-injection-providers.md
# aio/content/guide/dependency-injection.md
# aio/content/guide/deployment.md
# aio/content/guide/deprecations.md
# aio/content/guide/displaying-data.md
# aio/content/guide/dynamic-component-loader.md
# aio/content/guide/dynamic-form.md
# aio/content/guide/elements.md
# aio/content/guide/entry-components.md
# aio/content/guide/feature-modules.md
# aio/content/guide/file-structure.md
# aio/content/guide/form-validation.md
# aio/content/guide/forms-overview.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/ivy.md
# aio/content/guide/language-service.md
# aio/content/guide/lazy-loading-ngmodules.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/module-types.md
# aio/content/guide/ngmodule-api.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/providers.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/releases.md
# aio/content/guide/reusable-animations.md
# aio/content/guide/route-animations.md
# aio/content/guide/router.md
# aio/content/guide/rx-library.md
# aio/content/guide/schematics-authoring.md
# aio/content/guide/schematics-for-libraries.md
# aio/content/guide/schematics.md
# aio/content/guide/security.md
# aio/content/guide/service-worker-communications.md
# aio/content/guide/service-worker-config.md
# aio/content/guide/service-worker-devops.md
# aio/content/guide/service-worker-getting-started.md
# aio/content/guide/service-worker-intro.md
# aio/content/guide/set-document-title.md
# aio/content/guide/setup-local.md
# aio/content/guide/sharing-ngmodules.md
# aio/content/guide/singleton-services.md
# aio/content/guide/static-query-migration.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/transition-and-triggers.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/universal.md
# aio/content/guide/updating.md
# aio/content/guide/upgrade-setup.md
# aio/content/guide/upgrade.md
# aio/content/guide/user-input.md
# aio/content/guide/using-libraries.md
# aio/content/guide/visual-studio-2015.md
# aio/content/guide/web-worker.md
# aio/content/guide/workspace-config.md
# aio/content/marketing/events.html
# aio/content/marketing/resources.json
# aio/content/navigation.json
# aio/content/start/data.md
# aio/content/start/deployment.md
# aio/content/start/forms.md
# aio/content/start/index.md
# aio/content/start/routing.md
# aio/content/tutorial/index.md
# 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/package.json
# aio/src/app/app.component.spec.ts
# aio/src/app/custom-elements/api/api-list.component.html
# aio/src/app/layout/doc-viewer/doc-viewer.component.ts
# aio/src/app/layout/mode-banner/mode-banner.component.ts
# aio/src/app/layout/nav-item/nav-item.component.html
# aio/src/app/shared/toc.service.ts
# aio/src/styles/0-base/_typography.scss
# aio/src/styles/2-modules/_api-pages.scss
# aio/tools/transforms/templates/api/lib/memberHelpers.html
# aio/yarn.lock
# packages/common/http/src/headers.ts
# packages/common/http/src/interceptor.ts
# packages/common/http/src/params.ts
# packages/common/http/src/response.ts
# packages/common/src/common_module.ts
# packages/common/src/directives/ng_for_of.ts
# packages/common/src/location/location.ts
# packages/common/src/pipes/date_pipe.ts
# packages/core/src/change_detection/pipe_transform.ts
# packages/core/src/di/injectable.ts
# packages/core/src/metadata/di.ts
# packages/core/src/metadata/directives.ts
# packages/core/src/metadata/ng_module.ts
# packages/core/src/render3/component_ref.ts
# packages/forms/src/directives/reactive_directives/form_control_name.ts
# packages/forms/src/form_builder.ts
# packages/forms/src/model.ts
# packages/forms/src/validators.ts
# packages/router/src/config.ts
# packages/router/src/directives/router_outlet.ts
# packages/router/src/events.ts
# packages/router/src/router.ts
# packages/router/src/router_module.ts
# packages/router/src/router_state.ts
# packages/router/src/shared.ts
2020-01-24 15:55:22 +08:00
Judy Bogart
efdf347f9c
docs: apply standard header case convention ( #34196 )
...
PR Close #34196
2020-01-10 08:38:53 -08:00
zhusir
3835d83cdc
docs: 翻译错误
...
把伪类 `::ng-deep` 应用到如何一条 CSS 规则上就会完全禁止对那条规则的视图包装。
应翻译为
把伪类 `::ng-deep` 应用到任何一条 CSS 规则上就会完全禁止对那条规则的视图包装。
2019-08-27 13:05:53 +08:00
George Kalpakas
1bcd58cee8
refactor(docs-infra): remove linenums=false since it is now the default ( #31674 )
...
PR Close #31674
2019-07-24 14:38:54 -07:00
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
Blakenator
af4925f374
docs: clarify usage of using /deep/ in component styles guide ( #30452 )
...
Updated the description regarding the (deprecated) /deep/ pseudo-selector to clarify its propensity to bleed styles across components and its solution
closes #29967
PR Close #30452
2019-05-30 13:32:31 -04:00
Zhicheng WANG
9ec21f77fd
fix: 精修翻译
2019-02-15 07:12:41 +08:00
Zhicheng WANG
421fc1a846
fix: 精修翻译
...
恢复一些过度省略的 "Angular"
Angular 模块恢复为 NgModule
2019-02-15 07:12:40 +08:00
Zhicheng WANG
1d6c1396fd
fix: 修复一些翻译错误
2019-02-15 07:12:39 +08:00
Zhicheng WANG
49fd2eb76d
fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译
2019-01-01 22:17:43 +08:00
Zhicheng WANG
2f2cb99134
fix: 翻译改进
2018-12-20 09:21:56 +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
beebf7fe14
docs: change links to cli wiki to link to new aio docs ( #26489 )
...
PR Close #26489
2018-10-17 11:06:34 -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
966a29e072
fix: 修正合并时的错误
2018-07-27 20:22:07 +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
Stefanie Fluin
d523630ea2
docs(aio): cleanup aalert, callout, subsection use and author style ( #24986 )
...
PR Close #24986
2018-07-24 08:22:14 -07:00
Dario Braun
82004c76ac
docs: update component styles doc regarding relative URL ( #24471 )
...
Update the documentation to match the CLI mechanics regarding relative URL in link tags.
docs: update info on stylesheet location for CLI
PR Close #24471
2018-07-12 16:44:00 -04:00
Jamie Krug
505b54b86b
docs: fix typos referencing inline component styles ( #22557 )
...
PR Close #22557
2018-07-10 18:48:29 -07:00
Rob Wormald
3553977bd7
feat(core): add support for ShadowDOM v1 ( #24718 )
...
add a new ViewEncapsulation.ShadowDom option that uses the v1 Shadow DOM API to provide style encapsulation.
PR Close #24718
2018-07-02 14:37:41 -07:00
Zhicheng Wang
77a2381d0a
fix: sync to 6.0(WIP)
2018-05-07 13:06:47 +08:00
Brandon Roberts
fd9d1888ce
build(aio): align stackblitz files with Angular CLI V6 ( #23521 )
...
Also cleans up legacy references to `.angular-cli.json`
PR Close #23521
2018-05-02 15:00:57 -07:00
Zhicheng Wang
e167fa5229
refactor: 重构自动翻译代码
2018-03-24 20:03:10 +08:00
Zhicheng Wang
d0292bbe82
fix: 把遗漏的 我们 替换成 你
2018-03-23 09:43:02 +08:00
Zhicheng Wang
f75baea397
fix: 把除了 upgrading 之外的 我们 都替换成了 你
...
fix: 翻译了一部分 AOT Compiler
2018-03-22 17:19:12 +08:00
Zhicheng Wang
545d4b6c69
feat: 自动在中英文之间添加空格，以改善排版
2018-03-20 17:09:18 +08:00
Zhicheng Wang
0c420c2efc
fix: 纠正错误及翻译遗漏的部分
2018-03-12 13:04:48 +08:00
Zhicheng Wang
964266f4b0
fix: 合并第一版的翻译
2018-03-07 15:42:49 +08:00
Zhicheng Wang
9adeb14f3a
fix: 人工修订自动翻译
2018-03-07 12:26:05 +08:00
Zhicheng Wang
51bd598826
fix: 修正自动翻译结果
2018-03-07 10:55:42 +08:00
Zhicheng Wang
206f6ecc4f
fix: 修正最后一版的全部翻译
2018-03-04 09:07:33 +08:00
Zhicheng Wang
53a7a4cbf5
feat: add auto checker
...
fix: some translations found by auto checker
2018-03-01 22:19:59 +08:00
Zhicheng Wang
cacdf7b564
fix: 修正多行合并到一起的错误
2018-02-28 13:20:10 +08:00
Zhicheng Wang
c08a3830df
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.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/change-log.md
# aio/content/guide/component-styles.md
# aio/content/guide/deployment.md
# aio/content/guide/forms.md
# aio/content/guide/glossary.md
# aio/content/guide/http.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule.md
# aio/content/guide/pipes.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/router.md
# aio/content/guide/security.md
# aio/content/guide/set-document-title.md
# aio/content/guide/setup-systemjs-anatomy.md
# aio/content/guide/setup.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/upgrade.md
# aio/content/marketing/docs.md
# aio/content/marketing/features.html
# aio/content/marketing/resources.json
# aio/content/navigation.json
# aio/src/app/layout/doc-viewer/doc-viewer.component.ts
2018-02-28 13:13:29 +08:00
Zhicheng Wang
1531b0610d
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/attribute-directives.md
# aio/content/guide/bootstrapping.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.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/form-validation.md
# aio/content/guide/forms.md
# aio/content/guide/glossary.md
# aio/content/guide/http.md
# aio/content/guide/i18n.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule.md
# aio/content/guide/npm-packages.md
# aio/content/guide/pipes.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/structural-directives.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing.md
# aio/content/marketing/index.html
# aio/content/navigation.json
# aio/content/tutorial/index.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/src/app/embedded/api/api-list.component.ts
# aio/src/app/layout/doc-viewer/doc-viewer.component.ts
# aio/src/app/layout/footer/footer.component.html
# aio/src/app/layout/toc/toc.component.html
# aio/src/app/search/search.service.ts
# aio/src/styles/1-layouts/_marketing-layout.scss
# aio/yarn.lock
2018-02-28 08:08:59 +08:00
Pete Bacon Darwin
23596b3f30
docs(aio): fix missing stylesheet in component-styles example ( #21772 )
...
The code in the example was referring to `hero-app.component.css` but this did
not exist.
PR Close #21772
2018-01-25 13:38:12 -08:00
Jesus Rodriguez
1a75934cc0
build(aio): migrate plunker to stackblitz ( #20165 )
...
PR Close #20165
2018-01-23 21:30:27 -08:00
Ward Bell
5e25d3986d
docs: component-styles guide - inline styles must be CSS ( #20701 )
...
Cannot write them in less, sass, or stylus
See CLI issue https://github.com/angular/angular-cli/issues/8472
PR Close #20701
2017-12-05 21:54:23 -08:00
Ward Bell
567cc26b8e
docs: Component Styles guide for CLI ( #19791 )
2017-11-03 11:12:34 -07:00
Zhicheng Wang
3a584ba96c
fix: some untranslated english
2017-08-06 13:21:34 +08:00
Zhicheng Wang
0ddf72745e
fix: translate all pure english titles
2017-08-04 14:06:15 +08:00
Zhicheng Wang
f2059b445c
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.md
# aio/content/guide/attribute-directives.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/cb-index.md
# aio/content/guide/change-log.md
# aio/content/guide/cheatsheet.md
# aio/content/guide/cli-quickstart.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.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/dynamic-component-loader.md
# aio/content/guide/dynamic-form.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/index.md
# aio/content/guide/learning-angular.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule.md
# aio/content/guide/npm-packages.md
# aio/content/guide/pipes.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/router.md
# aio/content/guide/security.md
# aio/content/guide/server-communication.md
# aio/content/guide/set-document-title.md
# aio/content/guide/setup-systemjs-anatomy.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.md
# aio/content/guide/ts-to-js.md
# aio/content/guide/typescript-configuration.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/navigation.json
# aio/content/tutorial/index.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/package.json
# aio/src/styles/main.scss
# aio/transforms/angular.io-package/index.js
2017-07-30 00:09:50 +08:00
Zhicheng Wang
20a55c54ed
docs(aio): merge latest chinese translations
2017-07-23 11:51:25 +08:00
