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
Zhimin YE (Rex)
6aeb8efaa3
fix: live example localisation.
2016-09-19 10:03:53 +01:00
Zhicheng Wang
2a1c3626c5
去掉了大部分儿化音
...
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
Zhimin YE (Rex)
654030f09d
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/user-input.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt2.jade
# public/docs/ts/latest/tutorial/toh-pt4.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-23 14:02:54 +01:00
Zhimin YE (Rex)
f82232ae05
fix : #57
2016-08-23 10:21:32 +01:00
Jesús Rodríguez
e9a41bac47
docs(toh): add return types
...
closes #1983
2016-08-17 22:41:06 -07:00
Zhimin YE (Rex)
f26ec0a889
(review:) Quick starter and TOH, patch up new paragraphs and mis-alignments.
2016-08-16 10:16:31 +01:00
Zhicheng Wang
94aa3664ab
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# .gitignore
# public/docs/_examples/cb-component-communication/ts/app/app.component.ts
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/cookbook/dynamic-form.jade
# public/docs/ts/latest/cookbook/set-document-title.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt1.jade
# public/docs/ts/latest/tutorial/toh-pt3.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-12 07:57:51 +08:00
Peter Bacon Darwin
d79adb2422
docs(rc5): update docs and plunkers for rc5
2016-08-09 11:48:07 -07:00
Phil
adb1b1d43b
fix some translation in tutorial
2016-08-01 17:35:11 +08:00
Zhicheng Wang
6264d3bcde
批量把Provider/provide改译为提供商/提供，以和ISP（互联网服务提供商）的译法看齐
2016-07-07 08:22:36 +08:00
Zhicheng Wang
0303a18020
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/structural-directives.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/testing/testing-an-angular-pipe.jade
# public/docs/ts/latest/tutorial/index.jade
# public/docs/ts/latest/tutorial/toh-pt1.jade
# public/docs/ts/latest/tutorial/toh-pt2.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
# public/docs/ts/latest/tutorial/toh-pt6.jade
2016-07-07 08:15:51 +08:00
Patrice Chalin
b0e0d94b5c
docs: revert Jade to markdown
...
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
2016-07-05 23:03:30 -07:00
Zhicheng Wang
d1db5bfb72
翻译了教程中的HTTP一章
2016-06-17 23:13:23 +08:00
Zhicheng Wang
20c59f9e4a
Add some blank lines, to avoid unnecessary conflicts on merging.
2016-06-15 23:31:28 +08:00
Zhicheng Wang
7995cb4897
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/tutorial/toh-pt1.jade
# public/docs/ts/latest/tutorial/toh-pt2.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-06-14 14:04:30 +08:00
Zhicheng Wang
bc2e4b83c0
把所有全角括号改成了半角的
2016-06-14 09:26:54 +08:00
Zhicheng Wang
c1051cc8e1
微调
...
为词汇表加上了双语备注
2016-06-14 07:54:46 +08:00
Patrice Chalin
ca2e5c5d1d
docs(toh-4/ts): copyedits
...
closes #1638
2016-06-13 11:40:30 -07:00
Zhicheng Wang
f389c57ede
来自网友Z的修改意见
2016-06-13 17:22:28 +08:00
Zhicheng Wang
c802c2b5dc
来自网友张旋和Z的修改意见
2016-06-13 17:20:08 +08:00
Zhicheng Wang
f2dbdb3163
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/_examples/cb-component-communication/e2e-spec.ts
# public/docs/_examples/cb-component-communication/ts/app/app.component.ts
# public/docs/_examples/dependency-injection/ts/app/main.1.ts
# public/docs/ts/latest/tutorial/toh-pt1.jade
# public/docs/ts/latest/tutorial/toh-pt2.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-06-08 10:02:24 +08:00
Patrice Chalin
7e52648ee7
docs(toh): update live example links ( #1602 )
2016-06-07 15:51:25 -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
Foxandxss
33b5829b25
docs(toh): put a bit of clarification
...
closes #1352
2016-05-20 23:40:55 -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
33292b942c
把某些Provider批量替换为供应商
...
架构篇校对了一部分
2016-05-14 22:23:18 +08:00
Zhicheng Wang
8beee32a65
教程-服务 一审完毕
2016-05-12 17:50:30 +08:00
Dmitri Suvorov
33745ec220
docs(tutorial): fix typo (slowy -> slowly)
...
closes #1332
2016-05-11 19:24:00 -07:00
Zhicheng Wang
f413edce53
修订了教程-多个组件的一部分
...
部分“标记（tag）”批量替换为“标签”
2016-05-11 21:04:09 +08:00
Zhicheng Wang
15c927b29f
“教程-主从结构”一审完毕
...
把内置批量替换为内建
2016-05-11 20:34:47 +08:00
Zhicheng Wang
a870e4401b
部分“格式（form）”改为“形式”
2016-05-11 19:34:38 +08:00
Zhicheng Wang
f397bf6608
把“Live Example 鲜活范例”统一译成“在线例子”
2016-05-11 14:47:32 +08: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
d21325fa55
完成了指南首页
...
处理了排列不规范的列表翻译，以便将来可以统一实现对照翻译
2016-04-20 20:07:39 +08:00
Zhicheng Wang
bc9f46722f
教程第五章翻译了多一半儿，把黑板报批量改为仪表盘，把英雄之旅批量改为英雄指南
2016-04-17 23:31:22 +08:00
Zhicheng Wang
5e58b0a095
翻译完第四章
2016-04-17 10:24:39 +08:00
Zhicheng Wang
3cf6ca5f7e
第四章翻译了一半儿
2016-04-16 16:43:13 +08:00
James Laverack
56ed5e345c
docs(toh-4): reword the getHeroesSlowly instructions
...
closes #1011
rewording to: "replace `_heroService.getHeroes` with `_heroService.getHeroesSlowly`"
2016-04-02 15:30:16 -07:00
Foxandxss
5f73911eaf
chore(toh): change inputs array for input decorator/hero now a class
2016-03-25 16:51:46 -07:00
Emma
e17821492e
docs: update link to learning promises
...
to the chapter in Dr. Axel Rauschmayer's ES6 book from his old post
closes #1005
The old link on the documentation lead to an article on promises that
contained outdated information, so this one leads to newer content.
2016-03-25 15:09:09 -07:00
Ward Bell
a2cb80330a
docs: update to beta-12
2016-03-23 21:39:13 -07:00
Foxandxss
b2f2fb87ec
docs(toh): make a few corrections
...
closes #967
2016-03-17 21:09:54 -07:00
Foxandxss
cb0af7860d
docs(toh4): fix anchor
...
closes #975
2016-03-16 15:53:24 -07:00
Filipe Silva
b5ea1d8f68
docs(lifecycle-hooks): add hook sections, revise sample, add DoCheck & tests
2016-03-16 01:52:11 -07:00
Josh Otis
746a6649b2
chore: new flat left navigation panel (all language tracks)
2016-03-03 04:51:52 -08:00
