Zhicheng Wang f5c85b3e82 Merge remote-tracking branch 'origin/master' ... # Conflicts: # README.md # public/_data.json # public/_includes/_hero-home.jade # public/_includes/_main-nav.jade # public/_includes/_scripts-include.jade # public/docs/ts/latest/_data.json # public/docs/ts/latest/cheatsheet.jade # public/docs/ts/latest/cli-quickstart.jade # public/docs/ts/latest/cookbook/_data.json # public/docs/ts/latest/cookbook/ajs-quick-reference.jade # public/docs/ts/latest/cookbook/aot-compiler.jade # public/docs/ts/latest/cookbook/component-communication.jade # public/docs/ts/latest/cookbook/component-relative-paths.jade # public/docs/ts/latest/cookbook/dependency-injection.jade # public/docs/ts/latest/cookbook/dynamic-form.jade # public/docs/ts/latest/cookbook/form-validation.jade # public/docs/ts/latest/cookbook/i18n.jade # public/docs/ts/latest/cookbook/index.jade # public/docs/ts/latest/cookbook/ngmodule-faq.jade # public/docs/ts/latest/cookbook/set-document-title.jade # public/docs/ts/latest/cookbook/ts-to-js.jade # public/docs/ts/latest/cookbook/visual-studio-2015.jade # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/_data.json # public/docs/ts/latest/guide/animations.jade # public/docs/ts/latest/guide/appmodule.jade # public/docs/ts/latest/guide/architecture.jade # public/docs/ts/latest/guide/attribute-directives.jade # public/docs/ts/latest/guide/browser-support.jade # public/docs/ts/latest/guide/change-log.jade # public/docs/ts/latest/guide/component-styles.jade # public/docs/ts/latest/guide/dependency-injection.jade # public/docs/ts/latest/guide/displaying-data.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/hierarchical-dependency-injection.jade # public/docs/ts/latest/guide/learning-angular.jade # public/docs/ts/latest/guide/lifecycle-hooks.jade # public/docs/ts/latest/guide/ngmodule.jade # public/docs/ts/latest/guide/npm-packages.jade # public/docs/ts/latest/guide/pipes.jade # public/docs/ts/latest/guide/router.jade # public/docs/ts/latest/guide/security.jade # public/docs/ts/latest/guide/server-communication.jade # public/docs/ts/latest/guide/setup-systemjs-anatomy.jade # public/docs/ts/latest/guide/setup.jade # public/docs/ts/latest/guide/structural-directives.jade # public/docs/ts/latest/guide/style-guide.jade # public/docs/ts/latest/guide/template-syntax.jade # public/docs/ts/latest/guide/testing.jade # public/docs/ts/latest/guide/typescript-configuration.jade # public/docs/ts/latest/guide/upgrade.jade # public/docs/ts/latest/guide/webpack.jade # public/docs/ts/latest/index.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/_data.json # public/docs/ts/latest/tutorial/index.jade # public/docs/ts/latest/tutorial/toh-pt1.jade # public/docs/ts/latest/tutorial/toh-pt2.jade # public/docs/ts/latest/tutorial/toh-pt3.jade # public/docs/ts/latest/tutorial/toh-pt4.jade # public/docs/ts/latest/tutorial/toh-pt5.jade # public/docs/ts/latest/tutorial/toh-pt6.jade # public/events.jade # public/news.jade # public/presskit.jade		2017-04-15 15:34:47 +08:00
..
announcement-bar.js	removed navigation when only once announcement is present	2016-10-14 22:46:18 -07:00
api-list.js	Upgrade to 2.2.0	2016-11-22 20:07:16 +08:00
bio.js	fix(about): dialog should not show twitter if empty	2016-12-22 20:07:32 -08:00
bold.js	refactor(docs-app): move `bold` directive out of the app controller file	2015-12-10 21:35:02 -08:00
cheatsheet.js	Merge remote-tracking branch 'origin/master'	2017-02-26 15:39:42 +08:00
code-example.js	style(code-example): remove unwanted comment	2016-03-09 09:01:33 +00:00
code-pane.js	fix: misc typos in three files (#3463)	2017-04-01 11:38:49 -07:00
code-tabs.js	refact(app): use recommended `controller as` syntax	2015-11-15 20:52:35 +00:00
code.js	chore(docs-app): add `code` directive to prevent unwanted compilation	2015-12-01 09:44:33 -08:00
copy.js	design(style): Restyle changes from Alex	2016-09-14 17:18:55 -07:00
if-docs.js	chore(examples): Updated live example links to use helper directive	2016-08-05 16:41:45 -07:00
live-example.js	build: zipper revival (#3319)	2017-02-28 23:31:24 +01:00
scroll-y-offset-element.js	fix(app): ensure headings are visible when navigating to in-page anchors	2015-12-14 10:15:19 +00:00