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
..
ajs-quick-reference	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
animations	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -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(aio): Remove outdated README.md from cli-quickstart zip (#23947)	2018-05-22 13:37:15 -04: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(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
dependency-injection-in-action	docs: replace angular/http with HttpClient (#25068)	2018-07-24 20:54:44 -07: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	build(docs-infra): add support for examples of type `elements` (#24840)	2018-07-20 10:34:47 -07:00
feature-modules	Revert "docs: update docs to use HttpClientModule instead of HttpModule (#22727)"	2018-05-30 16:12:49 -07:00
form-validation	docs(aio): fix issues suggested by Kara (#23743)	2018-06-26 11:03:35 -07:00
forms	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
hierarchical-dependency-injection	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
http	docs(aio): update docs error in guide/http (#23567)	2018-04-27 07:24:17 -07:00
i18n	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
lazy-loading-ngmodules	Revert "docs: update docs to use HttpClientModule instead of HttpModule (#22727)"	2018-05-30 16:12:49 -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(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
ngmodules	docs: refactor ngmodules example (#25072)	2018-07-24 21:03:38 -07:00
observables	docs: fix multicasting example in observable guide (#24911)	2018-07-23 08:40:45 -07:00
observables-in-angular	fix: merge examples and images	2018-03-26 15:13:41 +08:00
pipes	fix(aio): fix error in import after RxJS 6 migration (#22886)	2018-05-09 11:52:04 -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: add new Reactive Forms guide (#24578)	2018-07-19 13:46:30 -04:00
router	docs: add message property to compose-message component (#24310)	2018-06-13 13:28:47 -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: refactor style guide example 03-06 (#24996)	2018-07-25 08:04:12 -07:00
template-syntax	docs(aio): Upgrade examples to Angular 6 (#23234)	2018-04-17 14:09:02 -07:00
testing	docs(aio): Add missing dependencies and files to testing zip file download (#23948)	2018-05-21 16:12:40 -04: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: consistent spacing in tutorial html files (#23105) (#24497)	2018-06-28 17:56:19 -04: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: consistent spacing in tutorial html files (#23105) (#24497)	2018-06-28 17:56:19 -04:00
toh-pt6	Merge remote-tracking branch 'en/master' into aio	2018-07-27 10:51:18 +08:00
universal	docs(aio): unified string chaining (#22735)	2018-07-10 18:50:44 -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