Commit Graph

11 Commits

Author SHA1 Message Date
rexebin ce3930b2c0 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.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/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-10-17 22:48:18 +01:00
Naomi Black 6ca91f710d api(cleanup): Remove preview from the API reference banner 2016-10-07 14:32:48 -07:00
Zhicheng Wang 84e96391ca 完成了导航菜单
完成了部分公共页面
完成了部分教程
2016-04-13 08:53:17 +08:00
Peter Bacon Darwin 05a272a116 refact(docs-app): move filtered API list into a directive
Each API index page now displays data from an `api-list.json` file found
locally to that page. This lets us have different API lists for TS, JS
and Dart.
2015-12-10 21:35:02 -08:00
Cory Bateman dbb065a7ed refact(app): use recommended `controller as` syntax
Updated site controllers and directives to use controller as syntax

Closes #84
Closes #135
2015-11-15 20:52:35 +00:00
Peter Bacon Darwin b5744c813a api-index: generate index page API list dynamically
Dgeni now generates a JSON file that is loaded by the AppController into
the index page for the API docs.
2015-11-03 16:41:38 +00:00
Peter Bacon Darwin 8ec5b2bb83 api-index: fix urls to directive API docs 2015-11-03 14:40:22 +00:00
Naomi Black 0d58eac67e docs(api list): fixing a typo in ng-cloak 2015-10-19 14:38:51 +01:00
Naomi Black a1e5b679cd docs(chore): fix deploy of api page and add a typo fix 2015-10-19 12:12:36 +01:00
Naomi Black 93d8ab82b1 docs(api list): use ng-cloak 2015-10-19 10:40:22 +01:00
Naomi Black cdec7d1605 api(map): fixing links in the filtered list, removing left nav 2015-10-15 23:57:15 -07:00