Zhicheng Wang 4400deeef8 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	gulpfile.js
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/resources/js/controllers/resources-controller.js

2016-07-24 17:27:48 +08:00

..

api

完成了导航菜单

2016-04-13 08:53:17 +08:00

cookbook

Merge remote-tracking branch 'angular.io/master'

2016-07-15 15:52:34 +01:00

guide

Merge remote-tracking branch 'origin/master'

2016-07-24 17:27:48 +08:00

testing

校对合并结果

2016-07-16 17:47:55 +08:00

tutorial

Merge remote-tracking branch 'origin/master'

2016-07-24 17:27:48 +08:00

_data.json

Merge remote-tracking branch 'origin/master'

2016-07-01 08:38:54 +08:00

_quickstart_repo.jade

把QuickStart改成“快速起步”

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

_util-fns.jade

docs: revert Jade to markdown

2016-07-05 23:03:30 -07:00

cheatsheet.jade

Merge remote-tracking branch 'remotes/angular.io/master'

2016-06-16 09:03:59 +01:00

cli-quickstart.jade

docs: update node and npm version recommendations

2016-07-05 23:09:37 -07:00

glossary.jade

Merge remote-tracking branch 'angular.io/master'

2016-07-15 15:52:34 +01:00

help-new.jade

完成了导航菜单

2016-04-13 08:53:17 +08:00

help.jade

improved infrastructure for devguide and revised getting started (TS)

2015-09-10 13:32:57 -07:00

index.jade

根据Hantsy的意见，把所有“API参考”改为“API参考手册”

2016-06-19 17:04:46 +08:00

quickstart.jade

纠正一个翻译错误，来自wudingli。

2016-07-14 10:41:54 +08:00

resources.jade

开发指南-组件样式 翻译了一半儿

2016-05-20 17:53:30 +08:00

styleguide.jade

docs: temporary TS-referencing chapters for gaps in JS/Dart

2016-03-01 11:22:04 -08:00