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
..
app	Merge remote-tracking branch 'en/master' into aio	2018-07-27 10:51:18 +08:00
assets	Merge remote-tracking branch 'en/master' into aio	2018-07-27 10:51:18 +08:00
content/images/bios	…
environments	Merge branch 'en-master' into aio	2018-05-15 23:26:31 +08:00
extra-files	fix: change some angular.io to angular.cn	2018-03-26 16:34:57 +08:00
styles	Merge remote-tracking branch 'en/master' into aio	2018-07-27 10:51:18 +08:00
testing	refactor(aio): rename method (loadContainingCustomElements --> loadContainedCustomElements) (#23944)	2018-05-29 18:00:33 -04:00
favicon.ico	…
google385281288605d160.html	…
ie-polyfills.js	…
index.html	Merge remote-tracking branch 'en/master' into aio	2018-07-27 10:51:18 +08:00
karma.conf.js	test(aio): fix tests and update testing infra (#23234)	2018-04-17 14:09:02 -07:00
main.ts	fix(aio): wait for the app to stabilize before registering the SW (#22483)	2018-03-30 15:26:50 -07:00
noop-worker-basic.js	…
polyfills.ts	test(aio): move reflect-metadata polyfills to test.ts (#23234)	2018-04-17 14:09:02 -07:00
pwa-manifest.json	fix(aio): make background transparent in 144x144 PWA icon (#23851)	2018-05-11 12:38:21 -04:00
styles.scss	…
test.ts	test(aio): move reflect-metadata polyfills to test.ts (#23234)	2018-04-17 14:09:02 -07:00
tsconfig.app.json	build(aio): turn off preserveWhitespaces in compiler options (#19702)	2017-11-01 15:24:43 -07:00
tsconfig.spec.json	test(aio): fix tests and update testing infra (#23234)	2018-04-17 14:09:02 -07:00
tslint.json	build(aio): update tslint and codelyzer (#23234)	2018-04-17 14:09:02 -07:00
typings.d.ts	…