Commit Graph

1998 Commits

Author SHA1 Message Date
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
Foxandxss 37b377ddb3 docs: update node and npm version recommendations
closes #1821
2016-07-05 23:09:37 -07: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
eltronix e2cd8ffe1d docs(testing): Fixed typo in pipe.jade
closes #1805
2016-07-05 21:06:13 -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
Zhimin YE (Rex) 800f2e6439 script(translate.js): dragging does not toggle original text. 2016-07-05 12:53:58 +01:00
Zhicheng Wang 6fcde3f63f 修改一个链接上的小问题 2016-07-05 11:23:45 +08:00
Zhicheng Wang be4748bce0 修改了一系列小bug
微调“关于”页面
2016-07-05 08:35:08 +08:00
Ward Bell e4c5fe32e7 docs(forms): fix import in sample HeroFormsComponent - @angular/common -> @angular/forms 2016-07-04 15:07:12 -07:00
Zhimin YE (Rex) b4857a59e0 correction(about.jade): 感谢谢-> 感谢 2016-07-04 15:51:28 +01:00
Zhimin YE (Rex) 24ab1e5fcc Chore: break a line in toh-pt1 2016-07-04 12:00:32 +01:00
Zhicheng Wang 3dd7fb7488 bbs先改回http 2016-07-04 17:21:56 +08:00
Zhicheng Wang a69c2fe427 微调 2016-07-04 17:03:26 +08:00
Zhicheng Wang 5d191fa335 根据栾跃的意见做了一些修改
加入了官方微信号
2016-07-04 17:00:20 +08:00
Zhimin(Rex) YE 3184375783 correction: router sample correction 2016-07-03 17:38:33 +01:00
Zhicheng Wang 78fb5708de 英文版改为English 2016-07-03 16:23:10 +08:00
Zhicheng Wang 711a173606 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/router.jade
2016-07-03 15:27:10 +08:00
Zhicheng Wang 9405f34b3c 微调 2016-07-03 15:20:07 +08:00
Zhicheng Wang 6b37b74665 加上了栾跃的致辞,并增设了论坛链接 2016-07-03 13:03:29 +08:00
Ward Bell dba3a8f9c9 docs: replace xxx.filter(...)[0] with xxx.find(...)
see #1801
2016-07-02 16:13:32 -07:00
Ward Bell fdbb7b5184 docs(router): clarify router redirect and link to Victor's blog post 2016-07-02 15:51:49 -07:00
Zhicheng Wang e82f462c78 文字微调 2016-07-02 22:51:35 +08:00
Zhicheng Wang d7a0458484 把到风格指南的链接改成绝对路径
文字微调
2016-07-02 22:45:30 +08:00
Zhicheng Wang bfddca872e 文字微调 2016-07-02 22:18:11 +08:00
Zhicheng Wang 675d7ea9ff 文字微调 2016-07-02 21:58: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
Foxandxss 1900eb1c70 docs: replace terminal with pathMatch, base href with '/'
closes #1799
2016-07-01 16:32:39 -07:00
Naomi Black 527fe50b88 footer(china): update the footer for localised docs 2016-07-01 13:41:06 -07:00
Patrice Chalin 0ba3d5d8d6 docs(dart/{quickstart,toh-[56]}): fix project names (#1773)
- Renamed `angular2_getting_started` to `angular2_quickstart` (to match
TS).
- s/-/_/g in project names elsewhere (only toh-5 & -6 needed to be
updated).

Fixes #378.
2016-07-01 11:05:45 -07:00
Alex ed4689fd2d update title to point to correct version 2016-07-01 08:01:16 -07:00
Foxandxss 4774f4861e chore: update router to beta 2 2016-07-01 08:00:50 -07:00
Eric Jimenez d5417a32a2 add cn language to footer 2016-07-01 07:59:29 -07:00
Zhicheng Wang 0dd2932a2e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/news.jade
#	public/resources/_data.json
#	public/resources/index.ejs
#	public/resources/js/controllers/resources-controller.js
2016-07-01 08:38:54 +08:00
Zhicheng Wang 1a806de866 移除行尾不必要的空格 2016-07-01 08:26:45 +08:00
Zhicheng Wang dfc20a6adc Merge remote-tracking branch 'cn/master' 2016-07-01 08:25:35 +08: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
Naomi Black 3c42db3b66 news(rc4): add rc4 post to news blog snippets 2016-06-30 13:25:45 -07:00
Zhicheng Wang 6c0cc46a01 chore: add Ralph to bios 2016-06-30 13:19:28 -07:00
Naomi Black 314ff5627b chore(version): update the version to rc4 2016-06-30 13:08:08 -07:00
Patrice Chalin 7d50fa9302 post-review updates
Also cleaned up `makeExample`s (changing most to `makeExcerpt`).
2016-06-30 13:04:55 -07:00
Patrice Chalin 705d8c50fd docs(security): proofread prose, app now shows good and bad
- App now shows how Angular handles untrusted URLs and resources
- E2e test covered new functionality
- Copyedits to prose
- Updated provider expressions to use latest syntax

The original security feature tracker:
https://github.com/angular/angular/issues/8511
2016-06-30 13:04:55 -07:00
Foxandxss 909f230cc7 update router to beta.1 2016-06-30 13:04:04 -07:00
Foxandxss 10de4c5753 update in memory web api 2016-06-30 13:03:44 -07:00
Foxandxss 2379e8b86e update plunkers versions 2016-06-30 12:40:59 -07:00
Foxandxss 6a34dce5e0 remove linting for spec file 2016-06-30 12:40:59 -07:00
Foxandxss 94f5609506 add rc4 versions 2016-06-30 12:40:59 -07:00
Foxandxss 55af9fee49 fix upgrade tests to not use deprecated API 2016-06-30 12:40:01 -07:00
Filipe Silva aa8ab52937 chore: update to rc.4 2016-06-30 12:40:01 -07:00