Zhicheng Wang 5f1f27e09c Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.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/index.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/news.jade
#	public/resources/index.jade

2016-05-19 13:33:02 +08:00

..

_data.json

Merge remote-tracking branch 'origin/master'

2016-05-19 13:33:02 +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

architecture.jade

feature的翻译从特征改为特性

2016-05-18 18:00:21 +08:00

attribute-directives.jade

Merge remote-tracking branch 'origin/master'

2016-05-19 13:33:02 +08:00

cheatsheet-cn.json

基础知识-小抄 一审完毕

2016-05-16 21:48:34 +08:00

cheatsheet.jade

docs: left nav is driven by _data.json files

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

component-styles.jade

docs(cb-webpack): add guide chapter about webpack

2016-05-12 17:22:14 -07:00

dependency-injection.jade

Merge remote-tracking branch 'origin/master'

2016-05-19 13:33:02 +08:00

displaying-data.jade

Merge remote-tracking branch 'origin/master'

2016-05-19 13:33:02 +08:00

forms.jade

Merge remote-tracking branch 'origin/master'

2016-05-19 13:33:02 +08:00

glossary.jade

docs: left nav is driven by _data.json files

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

hierarchical-dependency-injection.jade

docs(hierarchical-dependency-injection): Fixed typo

2016-05-11 19:33:17 -07:00

index.jade

Merge remote-tracking branch 'origin/master'

2016-05-19 13:33:02 +08:00

lifecycle-hooks.jade

docs(dev guide): lifecycle-hooks - updated dart/ts code and new dart prose

2016-05-06 14:17:34 +01:00

npm-packages.jade

docs(npm-packages): Fixed several typos

2016-05-11 20:07:40 -07:00

pipes.jade

docs(dev guide): pipes - new Dart prose, update Dart and Ts code (#1353)

2016-05-13 21:44:14 +01:00

router-deprecated.jade

docs(router-deprecated): link doc to deprecated examples

2016-05-10 21:34:07 -07:00

router.jade

docs(router): document new router and samples - phase 2

2016-05-03 15:51:24 -06:00

server-communication.jade

docs(http): remove status 200 guard and add RxJS operators individually

2016-05-17 01:45:52 -07:00

structural-directives.jade

docs(dev guide): cleanup of deprecated Jade mixin (#1322)

2016-05-09 21:13:50 +01:00

style-guide.jade

Merge remote-tracking branch 'origin/master'

2016-05-19 13:33:02 +08:00

template-syntax.jade

把QuickStart改成“快速起步”

2016-05-18 13:30:07 +08:00

testing.jade

一些小的修订

2016-04-23 22:16:28 +08:00

typescript-configuration.jade

docs(cb-webpack): add guide chapter about webpack

2016-05-12 17:22:14 -07:00

upgrade.jade

chore: update to rc.0

2016-05-02 19:57:28 -07:00

user-input.jade

基础知识-用户输入 一审完毕

2016-05-16 15:17:45 +08:00

webpack.jade

docs(webpack): fix tests sourcemaps / clarify logo image download

2016-05-15 16:08:38 -07:00