Commit Graph

39 Commits

Author SHA1 Message Date
Zhimin YE (Rex) 72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-01 09:51:27 +01:00
Ward Bell 2f115a3425 chore: fix broken devguide links as of May 31
Did not fix broken Dart and API links
2016-06-01 00:52:22 -07:00
Christopher Thorne 3d868da4b7 docs(toh-pt5): change getHero to match toh-pt6 getHero
closes #1551
2016-05-31 22:31:04 -07:00
Zhicheng Wang ae3b205c77 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-05-21 21:02:15 +08:00
Ward Bell f9fea00824 docs(component-relative-paths): new cookbook 2016-05-20 20:33:38 -07:00
Zhicheng Wang 29df35d724 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-05-20 15:34:27 +08:00
Zhicheng Wang aadbeb3ae9 修正一些合并中的问题 2016-05-19 19:23:01 +08:00
Ward Bell a4bc455030 docs(toh): remove unneeded directive from heroes.component 2016-05-19 00:57:35 -07:00
Torgeir Helgevold e4db340464 docs:(TOH chapter on Http) New Tour of Hero Chapter on Http 2016-05-18 23:38:08 -07:00
Zhicheng Wang 5f1f27e09c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/news.jade
#	public/resources/index.jade
2016-05-19 13:33:02 +08:00
Zhicheng Wang fd69ea3270 把部分expose统一译为暴露 2016-05-16 23:15:02 +08:00
Zhicheng Wang 5d92314efc 教程-路由 一审完毕 2016-05-12 22:56:12 +08:00
Zhicheng Wang 8beee32a65 教程-服务 一审完毕 2016-05-12 17:50:30 +08:00
Zhicheng Wang f397bf6608 把“Live Example 鲜活范例”统一译成“在线例子” 2016-05-11 14:47:32 +08:00
Foxandxss c8bdbd5ea9 docs(toh): link to deprecated router
closes #1309
2016-05-10 21:56:19 -07:00
Zhicheng Wang 99d89072d5 把所有误用的他改成它 2016-05-09 21:50:33 +08:00
Foxandxss 596825a8b1 docs: update all docs to partially comply the style-guide 2016-05-03 12:42:44 -06:00
Zhicheng Wang 583247f0f9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/features.jade
#	public/index.jade
2016-05-03 22:33:20 +08:00
Ward Bell 3d5302adce chore: update to rc.0 2016-05-02 19:57:28 -07:00
Zhicheng Wang de46beef2d 翻译完了displaying-data 2016-04-23 14:54:01 +08:00
Zhicheng Wang b007e835db Merge branch 'master' of github.com:angular/angular.io
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-04-20 20:09:50 +08:00
Zhicheng Wang d21325fa55 完成了指南首页
处理了排列不规范的列表翻译,以便将来可以统一实现对照翻译
2016-04-20 20:07:39 +08:00
Naomi Black 6d13db472a chore(links): make links to API docs relative 2016-04-19 17:44:38 -07:00
Zhicheng Wang b510dbcdcd 翻译完了教程第五章 2016-04-18 22:59:24 +08:00
Zhicheng Wang bc9f46722f 教程第五章翻译了多一半儿,把黑板报批量改为仪表盘,把英雄之旅批量改为英雄指南 2016-04-17 23:31:22 +08:00
Foxandxss b2f2fb87ec docs(toh): make a few corrections
closes #967
2016-03-17 21:09:54 -07:00
Ward Bell beb8efc71f docs(toh-5) reworded templateUrl/styleUrls notes 2016-03-08 15:09:31 -08:00
Foxandxss af1eaae873 docs(toh5): add better explanations for templateUrl
closes #929
2016-03-08 15:07:00 -08:00
Foxandxss d6dc97722b docs(toh5): fix typo
closes #930
2016-03-08 14:46:31 -08:00
Josh Otis 746a6649b2 chore: new flat left navigation panel (all language tracks) 2016-03-03 04:51:52 -08:00
Ward Bell 12500ebc29 docs(router): fix plunker preview image; move plunker link to top 2016-02-28 13:55:37 -08:00
Ward Bell ad7f172ea5 docs: share 'styles.css' across all samples all langs; fix styles 2016-02-28 12:47:01 -08:00
Ondra Hlaváč 8496dd016f docs(toh-5): fixes a typo in a link
closes #857
2016-02-19 00:29:24 -08:00
Ward Bell 3d992384c3 chore(devguide/ts): to beta.6 + typings + related doc updates 2016-02-12 00:56:22 -08:00
John Papa 1365d82527 docs(tutorial): add part 5-routing 2016-02-08 11:01:29 -08:00
Ward Bell 9e75006b2d chore(devguide): remove or guard unpublished files
closes #779
2016-01-29 13:48:51 -08:00
Ward Bell 79d3d9f0ad docs(samples): convert boot.ts -> main.ts
plus router text fix and missed beta.2 update to QS.js
closes #773
2016-01-28 17:32:38 -08:00
John Papa 7e86e9411b docs(tutorial): add ToH part 4
closes #589
2015-12-19 14:27:59 -08:00
Ward Bell 82383bc673 docs(tutorial): part 3 + revisions to intro, 1 & 2
closes #573
2015-12-16 18:08:38 -08:00