Commit Graph

10 Commits

Author SHA1 Message Date
Yang Lin 5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08:00
rexebin d9af771f8d Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/_includes/_ts-temp.jade
#	public/docs/index.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.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/index.jade
#	public/support.jade
2016-09-23 22:13:02 +01:00
Jesús Rodríguez 693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
Patrice Chalin 98efced068 docs(lang/latest): parameterize landing page Jade by language (#2389)
ng2.io preparatory work.
2016-09-19 20:14:31 -07:00
Zhicheng Wang f790354b8a 汉化第三方资源、快速开始(部分) 2016-04-13 08:53:17 +08:00
Ward Bell 1a8a2d7d90 docs(api): fix api nav issue #927
closes #932
2016-03-08 10:46:03 -08:00
Alex Wolfe 5be4e6fbea ordered guide 2015-04-16 07:24:28 -07:00
David East 22d6b1bedd Revisions. 2015-03-01 06:03:05 -08:00
Alex Wolfe e64f9f3584 dynamic path rendering in docs nag 2015-02-27 07:17:29 -08:00
David East 906f631f92 Quickstart. 2015-02-27 07:11:08 -08:00