angular-docs-cn

History

Zhimin YE (Rex) 0e14785cba Merge remote-tracking branch 'angular.io/master'

# Conflicts:
#	README.md
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade

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

api

refact(docs-app): move filtered API list into a directive

2015-12-10 21:35:02 -08:00

cookbook

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

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

guide

docs(all): link cleanup - broken and outdated

2016-07-11 21:50:07 -07:00

testing

chore: new flat left navigation panel (all language tracks)