Commit Graph

2257 Commits

Author SHA1 Message Date
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
dreamapple 22f608c05e 修改.gitignore 2016-07-03 15:22:47 +08:00
Zhicheng Wang 9405f34b3c 微调 2016-07-03 15:20:07 +08:00
dreamapple 2f7b750352 Merge branch 'master' of https://github.com/angular/angular-cn into dreamapple-contribute 2016-07-03 15:16:20 +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
dreamapple 402c2917f5 Merge branch 'master' of https://github.com/angular/angular-cn into dreamapple-contribute 2016-07-03 00:34:24 +08: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
dreamapple 489f160b30 修改了.gitignore文件,添加了.idea,那个是webstrom编辑器生成的一个文件夹 2016-07-01 21:59:50 +08: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
Rex fa9e83358c review(toh-pt6): done. 2016-06-30 20:35:04 +01:00
Naomi Black 509cae50a6 news(june30): updates to the news page for the week of june 30 2016-06-30 12:34:58 -07:00
eltronix 19d2e4ef4c Fixed typo 2016-06-30 11:51:53 -07:00
Zhimin YE (Rex) 43f400487e docs(router): explicit explaination of terminal property 2016-06-30 11:51:39 -07:00
Filipe Silva 387f7c6dd2 chore(deps): update in-memory-web-api 2016-06-30 11:50:43 -07:00
Patrice Chalin 1b58a86ced chore(gulp): lint should ignore dart build directories 2016-06-30 11:50:28 -07:00
Karan Gandhi 461213996e docs(toh-5/ts): Minor error fixed.
There are no leading slashes in the path.
2016-06-30 11:49:52 -07:00
Eric Jimenez 868abbe5c7 new style with new schema 2016-06-30 12:36:14 -04:00
Eric Jimenez 4a5f074061 add placeholder text when no description is found 2016-06-30 12:28:39 -04:00
Zhimin YE (Rex) 1f883722c9 review(toh-pt6): line 243 2016-06-30 17:08:34 +01:00