Commit Graph

252 Commits

Author SHA1 Message Date
Zhimin YE (Rex) 60a06e51b9 Merge remote-tracking branch 'angular.io/master'
# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-01 09:52:29 +01:00
Naomi Black 68c9561dec banner(angularconnect): add an ac promo to the banner 2016-07-29 15:23:03 -07:00
Zhicheng Wang e140256358 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
2016-07-17 20:40:12 +08:00
Patrice Chalin 1bef20abc4 docs(api/dart): add support for generation and display (#1888)
Fixes #1880.
Supersedes #1593.
2016-07-15 14:10:12 -07:00
Jesús Rodríguez d7ece5f4b7 chore: hide the english toggle link until angular is loaded 2016-07-15 17:58:01 +02:00
Naomi Black 5da6dff3ec launch(chinese): update the banner translation 2016-07-11 23:03:01 -07:00
Naomi Black be23e90095 launch(china): announce angular.cn 2016-07-11 22:45:23 -07:00
Zhicheng Wang 47eb31ddb2 移除banner中的切换中英文提示 2016-07-12 13:05:48 +08:00
Zhimin YE (Rex) 01dc30eb3e chore: Change toggle button text to English.
Add "Click to show/hide English" to home.
2016-07-08 09:47:55 +01:00
Zhicheng Wang ba245134a7 更换跟踪ID 2016-07-07 09:50:10 +08:00
Zhicheng Wang 1cb52fe7a0 加回Google分析代码 2016-07-07 09:40:38 +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 78fb5708de 英文版改为English 2016-07-03 16:23:10 +08:00
Zhicheng Wang d7a0458484 把到风格指南的链接改成绝对路径
文字微调
2016-07-02 22:45:30 +08:00
Zhicheng Wang 541eeedcec 修改了导航结构,放上了Naomi的致辞 2016-07-02 21:16:06 +08:00
Zhicheng Wang 3c5a045633 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/router.jade
2016-07-02 19:16:00 +08:00
Naomi Black f3da5c8a36 chinese(url): small change to url in footer 2016-07-01 19:21:36 -07:00
Naomi Black 527fe50b88 footer(china): update the footer for localised docs 2016-07-01 13:41:06 -07:00
Eric Jimenez d5417a32a2 add cn language to footer 2016-07-01 07:59:29 -07:00
Zhicheng Wang 2bc3b8ec75 校对完了“安全”一章 2016-06-29 18:28:17 +08:00
Zhicheng Wang fb22c0556c 内容微调 2016-06-29 13:11:23 +08:00
Zhicheng Wang fc6e68dc5c 调整首页
内容微调
2016-06-29 10:41:21 +08:00
Zhicheng Wang d7a71ccf59 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/security.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-06-28 09:40:49 +08:00
Patrice Chalin 3fe0fb077c docs(toh-6/ts): minor edits and enhancements (#1686)
* docs(toh-6/ts): minor edits and enhancements

Changes to prose:

- Complete TODO item of displaying `heroes.component` errors.
- Mainly copyedits.
- Add of blocks statements so that prose can be used on Dart side.
- Show excerpt and briefly explain of changes (previously missing):
  - `app/hero-detail.component.html`
  - `app/heroes.component.ts` error handling
- Add missing file to changed/added files listing and makeTabs
  - `toh-6/ts/app/in-memory-data.service.ts,
  - `toh-6/ts/sample.css`

Code changes:

- Mainly copyedits
- Renamed `heroes.component.ts` `delete` to `deleteHero` to match
naming of other methods

* remove unnecessary change relative to toh-5
2016-06-27 11:23:27 -07:00
Zhicheng Wang 443f726a04 重新开放dart版
接受网友Z的一个修订意见
2016-06-23 08:05:05 +08:00
Zhicheng Wang 06b5689842 添加了一个鸣谢清单 2016-06-19 17:17:31 +08:00
Zhicheng Wang 4b1d7d488d bugfix: 去掉了多加的translate-cn 2016-06-19 17:11:40 +08:00
Zhicheng Wang d46b4911e6 根据Hantsy的意见,把所有“API参考”改为“API参考手册”
为非对照模式的中文添加translated-cn类,以便自动加空格
2016-06-19 17:04:46 +08:00
Zhicheng Wang 80a044fa7c 直接加空格方式效果不理想,改用js和css配合来加空格 2016-06-19 16:46:50 +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
Foxandxss b1419f48ba chore: fix regions for e2e specs
closes #1657
2016-06-13 11:21:14 -07:00
Zhicheng Wang c802c2b5dc 来自网友张旋和Z的修改意见 2016-06-13 17:20:08 +08:00
Zhimin(Rex) YE ce299be58b Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/quickstart.jade
2016-06-02 22:29:17 +01:00
Patrice Chalin b48cde3a43 chore(_util-fns): generalize makeExample, drop makeProjExample (#1510)
+ Rename adjustExample{Path|Title} to adjustTsExample*4Dart
+ `makeExample` can now work with both doc folder relative and project
relative paths.
2016-06-02 17:06:03 +01:00
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
Patrice Chalin 5e50b2ef10 chore(util-fns): minor cleanup and refactoring (#1562)
This only impacts language dependent variable and path definitions:
- Removed deprecated variable.
- Hoisted useful variable definitions from quickstart into _util-fns.
- Minor fix in regexp of path translation function
2016-05-31 15:25:59 -07:00
Zhimin(Rex) YE 76aed6e600 minor fix on npm-package.jade
uncomment mixin for js docs.
2016-05-27 00:51:01 +01:00
Zhimin(Rex) YE cbea511cad Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/guide/template-syntax.jade
2016-05-26 23:48:22 +01:00
Zhimin(Rex) YE 70f534cc2a removed js/dart languages from dropdown list.
review for displaying-data.jade and index.jade.
2016-05-26 22:52:50 +01:00
Patrice Chalin a664f46231 docs(template-syntax): review and update Dart to new doc design (#1465)
* ts template-syntax.jade without docregion tags
* update guide/template-syntax for dart and ts
* clarify style property naming in Dart
2016-05-25 15:09:45 -07:00
Zhicheng Wang 33aed368c9 微调 2016-05-25 21:18:25 +08:00
Zhicheng Wang 7f6b69e9d2 略作修改,加上了到官网的链接 2016-05-25 11:20:05 +08:00
Zhicheng Wang af32ef14ca 去掉到firebase的cdn 2016-05-20 08:52:52 +08:00
Zhicheng Wang 4840597b5f 修改了一些错误和未翻译的地方 2016-05-19 16:47:48 +08: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
Kathy Walrath a595eb81ef docs(dart): update BASICS intro (#1410)
Also copy edited the TS version a bit.
2016-05-18 13:43:02 -07:00
Patrice Chalin 5b1a84be4c chore(docs): revise makeExcerpt mixin, add makeProjExample mixin
Be more DRY when referencing examples and excerpts. E.g.,
```jade
+makeExcerpt('quickstart/ts/app/app.component.ts', 'import',
'app/app.component.ts (import)')
```
can now be just
```jade
+makeExcerpt('app/app.component.ts', 'import')
```
Defined new mixin for examples named `makeProjExample` using this new
scheme.
The original `makeExample` has been left untouched.

Applied new mixins to quickstart.

closes #1420
2016-05-18 10:27:51 -07:00
Eric Jimenez 5a0a0160ce feat(firebase): feed resources page using firebase. Check for approved entries of the resources page 2016-05-16 22:43:32 -04:00
Eric Jimenez 21272435a3 feat(badging): Enum only matches enums, as opposed to Const and Enums. Const matches const, var, and let 2016-05-16 22:41:43 -04:00