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
|
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 |
arjunyel
|
e1990a5a80
|
docs: firefox web components info (#26118)
PR Close #26118
|
2018-09-26 15:25:44 -07:00 |
George Kalpakas
|
7b89711402
|
docs(elements): add section about custom element typings in `elements` guide (#25219)
PR Close #25219
|
2018-08-02 08:32:59 -07:00 |
|
George Kalpakas
|
f1223628a6
|
docs(elements): add link to full example in `elements` guide (#25219)
PR Close #25219
|
2018-08-02 08:32:59 -07:00 |
|
George Kalpakas
|
1b4269ad85
|
docs(elements): remove unnecessary whitespace in `elements` guide (#25219)
PR Close #25219
|
2018-08-02 08:32:59 -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 |
|
Zhicheng Wang
|
b7f7ca8bdf
|
fix: 文字微调
|
2018-05-26 09:49:01 +08:00 |
|
Zhicheng Wang
|
8494cf4b25
|
fix: 翻译微调
|
2018-05-19 22:22:18 +08:00 |
|
Zhicheng Wang
|
f5b24bf615
|
fix: fine-tuning translation
|
2018-05-16 13:08:17 +08:00 |
|
Zhicheng Wang
|
b6a0b06454
|
fix: translate new chapter "Angular Elements Overview"
|
2018-05-16 12:59:27 +08:00 |
Judy Bogart
|
72eab4d254
|
docs(elements): emphasize future direction, update link (#23806)
PR Close #23806
|
2018-05-10 15:46:53 -07:00 |
|
Zhicheng Wang
|
5d573e8001
|
fix: sync to 6.0(DI & deploy)
|
2018-05-08 13:32:11 +08:00 |
Andrew Seguin
|
56828e43b6
|
docs(elements): add intro connecting angular elements to custom elements (#23638)
PR Close #23638
|
2018-05-02 14:57:20 -07:00 |
Rob Wormald
|
74b203a55e
|
docs(elements): add ng-add docs to elements guide (#23350)
PR Close #23350
|
2018-04-13 00:50:04 -07:00 |
|
Rob Wormald
|
eb9968ab2a
|
docs(elements): use Angular Elements naming in nav (#23213)
PR Close #23213
|
2018-04-05 16:32:57 -07:00 |
|
Judy Bogart
|
ff34d5ea7a
|
docs: add custom elements documentation (#22966)
PR Close #22966
|
2018-04-02 14:13:46 -07:00 |
|
Andrew Seguin
|
46efd4b938
|
feat(elements): George's comments (#22413)
PR Close #22413
|
2018-03-16 12:39:07 -07:00 |
|
Andrew Seguin
|
22b96b9690
|
feat(elements): add support for creating custom elements (#22413)
PR Close #22413
|
2018-03-16 12:39:07 -07:00 |