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
..
ajs-quick-reference	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
animations	docs(animations): updated animation docs (#24206)	2018-09-19 10:37:31 -07:00
architecture	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
attribute-directives	docs: fix docregion in attribute directives for highlight directive (#23972)	2018-07-02 14:36:24 -07:00
bootstrapping	docs: replace angular/http with HttpClient (#25066)	2018-07-24 20:51:50 -07:00
cli-quickstart	docs: getting started updated for accuracy and style (#26093)	2018-10-12 14:16:02 -07:00
component-interaction	docs(aio): changed 'onVoted' output property to 'voted' to be in line with the styleguide (#23832)	2018-05-16 17:23:05 -04:00
component-styles	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
dependency-injection	docs: edit and organize di guide (#21915)	2018-08-30 13:15:47 -04:00
dependency-injection-in-action	docs: edit and organize di guide (#21915)	2018-08-30 13:15:47 -04:00
displaying-data	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
docs-style-guide	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
dynamic-component-loader	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
dynamic-form	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
elements	docs(elements): add link to full example in `elements` guide (#25219)	2018-08-02 08:32:59 -07:00
feature-modules	docs: refactor feature modules example (#25069)	2018-07-27 09:28:12 -07:00
form-validation	docs(aio): add async validation chapter (#25189)	2018-08-10 09:14:25 -07:00
forms	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
forms-overview	docs: remove unused properties from forms overview example (#25663)	2018-09-25 18:48:15 -07:00
hierarchical-dependency-injection	docs: edit and organize di guide (#21915)	2018-08-30 13:15:47 -04:00
http	Revert "docs: add testing styles in index.html, remove additional configuration" (#25892)	2018-10-09 17:04:19 -07:00
i18n	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
lazy-loading-ngmodules	docs: fix broken lazy loading examples with Angular CLI RC upgrade (#25892)	2018-10-09 17:04:19 -07:00
lifecycle-hooks	style: remove empty comments (#23404)	2018-05-10 15:48:13 -07:00
ngcontainer	docs: refactored ng-container code (#22742)	2018-07-06 13:49:35 -07:00
ngmodule-faq	docs: fix broken lazy loading examples with Angular CLI RC upgrade (#25892)	2018-10-09 17:04:19 -07:00
ngmodules	docs: fix broken lazy loading examples with Angular CLI RC upgrade (#25892)	2018-10-09 17:04:19 -07:00
observables	docs: update docs to reflect the changes in RxJS 6 (#26238)	2018-10-08 13:43:12 -07:00
observables-in-angular	fix: merge examples and images	2018-03-26 15:13:41 +08:00
pipes	docs: refactor pipe example to use the HttpClient (#22741)	2018-07-30 14:34:32 -07:00
practical-observable-usage	fix: merge examples and images	2018-03-26 15:13:41 +08:00
providers	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
quickstart	build(aio): check for obsolete `plnkr.json` and missing `main` files (#20165)	2018-01-23 21:30:27 -08:00
reactive-forms	docs: update shared example dependencies to Angular 7 and CLI 7 (#25892)	2018-10-09 17:04:19 -07:00
router	docs: clean up providedIn: 'root' syntax for router examples (#20023)	2018-09-26 10:14:49 -07:00
rx-library	docs: square odds example in rxjs guide (#24947)	2018-07-23 08:41:58 -07:00
security	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
service-worker-getting-started	fix(service-worker): deprecate `versionedFiles` in asset-group resources (#23584)	2018-05-15 12:19:08 -07:00
set-document-title	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
setup	build: upgrade zone.js (#23108)	2018-04-04 08:24:02 -07:00
structural-directives	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
styleguide	docs: make css multiline in styleguide for consistency (#25300)	2018-08-08 13:12:34 -07:00
template-syntax	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
testing	docs: fix broken lazy loading examples with Angular CLI RC upgrade (#25892)	2018-10-09 17:04:19 -07:00
toh-pt0	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
toh-pt1	docs: consistent spacing in tutorial html files (#23105) (#24497)	2018-06-28 17:56:19 -04:00
toh-pt2	docs: fix issues related to tutorial. (#24445)	2018-09-25 18:45:19 -07:00
toh-pt3	docs: consistent spacing in tutorial html files (#23105) (#24497)	2018-06-28 17:56:19 -04:00
toh-pt4	docs: consistent spacing in tutorial html files (#23105) (#24497)	2018-06-28 17:56:19 -04:00
toh-pt5	docs: fix issues related to tutorial. (#24445)	2018-09-25 18:45:19 -07:00
toh-pt6	Merge remote-tracking branch 'en/master' into aio	2018-10-21 17:43:29 +08:00
universal	docs: remove code in universal hero detail component (#25215)	2018-08-06 13:39:23 -07:00
upgrade-module	docs(aio): Cleanup examples with edits from Igor/George (#23234)	2018-04-17 14:09:02 -07:00
upgrade-phonecat-1-typescript	test(aio): fix upgrade-phonecat examples e2e tests (#24583)	2018-06-25 09:30:46 -07:00
upgrade-phonecat-2-hybrid	test(aio): fix upgrade-phonecat examples e2e tests (#24583)	2018-06-25 09:30:46 -07:00
upgrade-phonecat-3-final	test(aio): fix upgrade-phonecat examples e2e tests (#24583)	2018-06-25 09:30:46 -07:00
user-input	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
visual-studio-2015	docs(aio): remove example specific `.gitignore` files	2017-06-09 14:33:21 +01:00
.gitignore	test(aio): fix upgrade-phonecat examples e2e tests (#24583)	2018-06-25 09:30:46 -07:00
tsconfig.json	build(aio): give intellisense to the examples	2017-04-15 22:15:54 +01:00
tslint.json	build(aio): lint examples	2017-05-03 13:44:41 -07:00