Zhicheng Wang 94aa3664ab Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	.gitignore
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade

2016-08-12 07:57:51 +08:00

..

_data.json

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

AngularCheatSheet_Letter.pdf

docs(cheatsheet): update for alpha-44

2015-10-20 01:26:36 +01:00

AngularCheatSheet_Poster.pdf

docs(cheatsheet): update for alpha-44

2015-10-20 01:26:36 +01:00

animations.jade

合并了官方的最新更新

2016-08-06 20:04:41 +08:00

architecture.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

attribute-directives.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

cheatsheet-cn.json

批量把Provider/provide改译为提供商/提供，以和ISP（互联网服务提供商）的译法看齐

2016-07-07 08:22:36 +08:00

cheatsheet.jade

docs: left nav is driven by _data.json files

2016-03-04 19:54:27 -08:00

component-styles.jade

Merge remote-tracking branch 'origin/master'

2016-07-07 08:15:51 +08:00

dependency-injection.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

displaying-data.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

forms-deprecated.jade

docs(rc5): update docs and plunkers for rc5

2016-08-09 11:48:07 -07:00

forms.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

glossary.jade

chore: fix "Invalid example" warnings from shred map builder

2016-07-11 20:10:56 -07:00

hierarchical-dependency-injection.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

index.jade

合并了官方的最新更新

2016-08-06 20:04:41 +08:00

lifecycle-hooks.jade

Merge remote-tracking branch 'origin/master'

2016-07-07 08:15:51 +08:00

ngmodule.jade

docs(ngmodule): add chapter

2016-08-09 12:31:52 -07:00

npm-packages.jade

Merge remote-tracking branch 'origin/master'

2016-07-26 17:45:25 +08:00

pipes.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

router-deprecated.jade

chore(examples): Updated live example links to use helper directive

2016-08-05 16:41:45 -07:00

router.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

security.jade

批量把Provider/provide改译为提供商/提供，以和ISP（互联网服务提供商）的译法看齐

2016-07-07 08:22:36 +08:00

server-communication.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

structural-directives.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

style-guide.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

template-syntax.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

testing.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

typescript-configuration.jade

Merge remote-tracking branch 'origin/master'

2016-07-11 08:32:56 +08:00

upgrade.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00

user-input.jade

Merge remote-tracking branch 'origin/master'

2016-08-06 19:52:08 +08:00

webpack.jade

Merge remote-tracking branch 'origin/master'

2016-08-12 07:57:51 +08:00