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 |
Zhicheng Wang
|
84e96391ca
|
完成了导航菜单
完成了部分公共页面
完成了部分教程
|
2016-04-13 08:53:17 +08:00 |
Teresa
|
0ddf63957c
|
Moved feedback script to _scripts-include.jade
|
2016-01-08 17:51:43 -08:00 |
|
Teresa
|
014404239d
|
Added help-new.jade
|
2016-01-08 17:49:00 -08:00 |
Naomi Black
|
ee5da936da
|
feature(feedback): add feedback API call to the site
|
2015-12-09 13:05:45 -08:00 |
|
Naomi Black
|
fad02f7405
|
chore(feedback): fixing feedback script
|
2015-12-09 09:59:07 -08:00 |
|
Teresa
|
377f924ae2
|
Moved feedback script to _scripts-include.jade
|
2015-12-08 15:42:07 -08:00 |
|
Teresa
|
5be5985358
|
Added help-new.jade
|
2015-12-08 15:42:07 -08:00 |