Commit Graph

2495 Commits

Author SHA1 Message Date
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
Zhimin YE (Rex) b97f82a171 review(router): first review is done. 2016-06-30 12:20:05 +01:00
Zhicheng Wang 8764840779 “安全”二审完毕 2016-06-30 08:18:25 +08:00
Rex f4c56cbae6 router.jade: review to line 2088 2016-06-29 22:16:12 +01:00
Filipe Silva e7bddeb5f9 chore(examples): revert back to stable TS
The new router once required TS1.9 but it doesn't anymore. It's best to revert our examples to TS 1.8 since that is what we tell users to install, and we want to be testing on the current setup.
2016-06-29 12:28:45 -07:00
eltronix bc0cb52851 Fixed typo 2016-06-29 12:28:24 -07:00
Zhimin YE (Rex) 9b40ea56dc chore: add Rex bios 2016-06-29 12:28:07 -07:00
eltronix 2bd79e8482 Fixed Rendering error 2016-06-29 12:27:44 -07:00
Rex 397a1247b8 router.jade review to line 1586 2016-06-29 19:43:59 +01:00
Filipe Silva 4c1b441227 chore(travis): add preview builds 2016-06-29 18:45:20 +01:00
Zhimin YE (Rex) 77fc29977b Merge branch 'master' of https://github.com/angular/angular-cn 2016-06-29 17:04:36 +01:00
Zhimin YE (Rex) d5728d8b1c minor correction to quickstart.jade and review of router.jade to line 903. 2016-06-29 17:04:22 +01:00
Zhicheng Wang 2bc3b8ec75 校对完了“安全”一章 2016-06-29 18:28:17 +08:00