Yang Lin
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +08:00
Zhimin YE
61a5a227b0
merge: server-communication
2016-11-04 16:12:31 +00:00
Zhicheng Wang
54d1be2e5a
把angular2-in-memory-web-api改名为angular-in-memory-web-api
...
#84
2016-09-30 21:38:44 +08:00
Zhimin YE (Rex)
a18aa9ec01
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# 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/index.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
2016-09-26 15:14:39 +01:00
Ward Bell
6e17d33475
chore: update samples to "angular-in-memory-web-api" ( #2472 )
...
chore: update samples to "angular-in-memory-web-api"
2016-09-25 15:24:13 -07:00
rexebin
f7c60a07df
fix: change all 他 > 它
2016-09-25 19:50:45 +01:00
Zhimin YE (Rex)
6aeb8efaa3
fix: live example localisation.
2016-09-19 10:03:53 +01:00
Zhicheng Wang
2417245114
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/_data.json
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_hero.jade
# public/_includes/_main-nav.jade
# public/_includes/_util-fns.jade
# public/docs/_includes/_side-nav.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/animations.jade
# public/docs/ts/latest/guide/ngmodule.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/testing/_data.json
# public/docs/ts/latest/testing/application-under-test.jade
# public/docs/ts/latest/testing/first-app-tests.jade
# public/docs/ts/latest/testing/index.jade
# public/docs/ts/latest/testing/jasmine-testing-101.jade
# public/docs/ts/latest/testing/testing-an-angular-pipe.jade
# public/index.jade
# public/resources/css/main.scss
# public/resources/css/module/_side-nav.scss
2016-09-15 15:23:48 +08:00
Benjamin Dopplinger
d858ed379a
docs(server-communication): fix "app/app.module.ts" typo
...
closes #2283
2016-09-13 20:52:26 -07:00
Jonathan Persson
f2b1bbaba9
Remove a superfluous `.` in HTTP client docs 😄 ( #2313 )
2016-09-13 16:13:44 -07:00
Shai Reznik
3c9ff061c6
docs(server-communication): fix small typo ( #2312 )
2016-09-13 15:58:39 -07:00
Zhicheng Wang
2a1c3626c5
去掉了大部分儿化音
...
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
Zhicheng Wang
8a7165acf5
对上次的合并查漏补缺
2016-09-10 20:44:57 +08:00
Zhicheng Wang
969da7d321
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/_includes/_scripts-include.jade
# public/docs/_examples/homepage-hello-world/ts/index.1.html
# public/docs/_examples/homepage-tabs/ts/index.1.html
# public/docs/_examples/homepage-todo/ts/index.1.html
# public/docs/_examples/systemjs.config.plunker.build.js
# public/docs/_examples/systemjs.config.plunker.js
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/cookbook/component-relative-paths.jade
# 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/attribute-directives.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/index.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/ngmodule.jade
# public/docs/ts/latest/guide/npm-packages.jade
# public/docs/ts/latest/guide/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/_data.json
# public/docs/ts/latest/tutorial/toh-pt6.jade
# public/features.jade
# public/resources/js/directives/live-example.js
# tools/plunker-builder/indexHtmlTranslator.js
2016-09-08 17:20:01 +08:00
Patrice Chalin
59f6ebe849
docs(*): misc fixes to prose in support of jade2ng ( #2266 )
...
Fixes to prose “syntax”. Anomalies detected by jade2ng.
Also updated the main _utils-fn.jade in support of jade2ng as well.
2016-09-06 10:28:24 -07:00
Trotyl Yu
128915d6c3
docs(server-communication): Fetch API does not belong to ECMAScript
...
closes #2107
Fetch API is a Web API, has its own specification. ECMAScript is the specification of the JavaScript language, nothing to do with Web API.
2016-08-24 23:39:36 -07:00
Zhimin YE (Rex)
1b59799b60
fix: server-communication
2016-08-24 14:51:07 +01: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
Ward Bell
2c8a7982e7
docs: use InMemoryWebApiModule everywhere
...
closes #2137
2016-08-19 04:26:36 -07:00
Zhimin YE (Rex)
56b20ce877
review: patch up attribute-directives and server-communication.
2016-08-16 12:31:47 +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
Zhicheng Wang
3e1fe05f8a
校对
2016-08-01 13:43:28 +08:00
Zhicheng Wang
91eb1f6f45
校对
2016-07-26 17:35:18 +08:00
Zhicheng Wang
01d2494879
校对
2016-07-26 17:34:04 +08:00
Zhimin YE (Rex)
0e14785cba
Merge remote-tracking branch 'angular.io/master'
...
# Conflicts:
# README.md
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/testing/first-app-tests.jade
# public/docs/ts/latest/testing/jasmine-testing-101.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
2016-07-15 15:52:34 +01:00
Patrice Chalin
98e5d4af77
docs(all): link cleanup - broken and outdated
...
closes #1841
Fixes all broken links except genuine errors (see #1840 ), have been
resolved as of 2016-07-06
(https://github.com/angular/angular/commit/2708ce6a17667a2369c83bcf244c9
366b058d4c9).
Fixes #1574
2016-07-11 21:50:07 -07: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
Stephen Fox
e766f666bd
docs(http): Small typo fix in sentence reference to items: Observable
...
Ward tacked on router: ngDestroy -> ngOnDestroy
closes #1690
2016-07-05 20:55:03 -07:00
Zhicheng Wang
21fe9dc1d2
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/testing/first-app-tests.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
# public/news.jade
2016-07-01 08:24:23 +08:00
Patrice Chalin
b049c1bcf4
chore(guide/server-communication): fix indentation in Jade
2016-06-28 12:52:47 -07:00
Zhicheng Wang
64b9e476fb
把alternative统一改为备选或替代品(取决于语境)
2016-06-21 07:54:34 +08:00
Zhimin(Rex) YE
3271bdff60
review of server-communication is done.
2016-06-15 21:44:55 +01:00
Zhimin YE (Rex)
d23e541541
review to line 888 for server-communication.jade.
2016-06-15 17:04:32 +01:00
Zhimin(Rex) YE
04fd6f7102
review of server-communication to line 593
2016-06-14 23:43:52 +01:00
Zhicheng Wang
bc2e4b83c0
把所有全角括号改成了半角的
2016-06-14 09:26:54 +08:00
Zhicheng Wang
9789413bda
文字微调
2016-06-13 16:35:21 +08:00
Zhicheng Wang
164244d77a
修正了api的链接(仅中文版)
2016-06-10 14:45:12 +08:00
Zhimin(Rex) YE
49a2deb37b
guide/server-communication.jade review is done.
2016-06-05 17:19:22 +01:00
Zhicheng Wang
752a152731
Merge remote-tracking branch 'origin/master'
...
upgrade.jade的附录没有翻译
# Conflicts:
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/npm-packages.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/quickstart.jade
# public/index.jade
2016-05-30 21:46:16 +08:00
Zhicheng Wang
ce2b8127cb
开发指南-从1.x升级 翻译了2/3左右
...
把所有“操作函数”统一改名为“操作符”,在此语境下不会被混淆
2016-05-29 14:23:53 +08:00
Foxandxss
c2c6096bec
docs(server-communication): fix anchor link
...
closes #1537
2016-05-28 09:38:26 -07:00
Zhicheng Wang
940d0d9c22
开发指南-生命周期钩子 翻译完毕
2016-05-26 19:02:38 +08:00
Zhicheng Wang
79eddc2553
开发指南-HTTP客户端 翻译完毕
2016-05-25 21:18:25 +08:00
Zhicheng Wang
7f6b69e9d2
略作修改,加上了到官网的链接
2016-05-25 11:20:05 +08:00
Zhicheng Wang
bfc7c818cb
开发指南-HTTP客户端 翻译了一半儿
2016-05-24 21:27:24 +08:00
Zhicheng Wang
cba044f558
开发指南-HTTP客户端 翻译了一小部分
2016-05-24 13:12:34 +08:00
Zhicheng Wang
cb756a5a05
统一了大量Attribute和Property的翻译
...
更新了小抄
调整了翻译样式
2016-05-24 11:33:50 +08:00