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
37b377ddb3
docs: update node and npm version recommendations
...
closes #1821
2016-07-05 23:09:37 -07:00
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
e2cd8ffe1d
docs(testing): Fixed typo in pipe.jade
...
closes #1805
2016-07-05 21:06:13 -07:00
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
be4748bce0
修改了一系列小bug
...
微调“关于”页面
2016-07-05 08:35:08 +08:00
24ab1e5fcc
Chore: break a line in toh-pt1
2016-07-04 12:00:32 +01:00
3184375783
correction: router sample correction
2016-07-03 17:38:33 +01:00
711a173606
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/ts/latest/guide/router.jade
2016-07-03 15:27:10 +08:00
fdbb7b5184
docs(router): clarify router redirect and link to Victor's blog post
2016-07-02 15:51:49 -07:00
3c5a045633
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/ts/latest/guide/router.jade
2016-07-02 19:16:00 +08:00
1900eb1c70
docs: replace terminal with pathMatch, base href with '/'
...
closes #1799
2016-07-01 16:32:39 -07:00
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
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
1a806de866
移除行尾不必要的空格
2016-07-01 08:26:45 +08:00
dfc20a6adc
Merge remote-tracking branch 'cn/master'
2016-07-01 08:25:35 +08:00
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
314ff5627b
chore(version): update the version to rc4
2016-06-30 13:08:08 -07:00
7d50fa9302
post-review updates
...
Also cleaned up `makeExample`s (changing most to `makeExcerpt`).
2016-06-30 13:04:55 -07:00
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
909f230cc7
update router to beta.1
2016-06-30 13:04:04 -07:00
aa8ab52937
chore: update to rc.4
2016-06-30 12:40:01 -07:00
fa9e83358c
review(toh-pt6): done.
2016-06-30 20:35:04 +01:00
19d2e4ef4c
Fixed typo
2016-06-30 11:51:53 -07:00
43f400487e
docs(router): explicit explaination of terminal property
2016-06-30 11:51:39 -07:00
1f883722c9
review(toh-pt6): line 243
2016-06-30 17:08:34 +01:00
b97f82a171
review(router): first review is done.
2016-06-30 12:20:05 +01:00
8764840779
“安全”二审完毕
2016-06-30 08:18:25 +08:00
f4c56cbae6
router.jade: review to line 2088
2016-06-29 22:16:12 +01:00
bc0cb52851
Fixed typo
2016-06-29 12:28:24 -07:00
2bd79e8482
Fixed Rendering error
2016-06-29 12:27:44 -07:00
397a1247b8
router.jade review to line 1586
2016-06-29 19:43:59 +01:00
77fc29977b
Merge branch 'master' of https://github.com/angular/angular-cn
2016-06-29 17:04:36 +01:00
d5728d8b1c
minor correction to quickstart.jade and review of router.jade to line 903.
2016-06-29 17:04:22 +01:00
2bc3b8ec75
校对完了“安全”一章
2016-06-29 18:28:17 +08:00
b21c90c358
fix(doc): fix 404 problem of some api url
2016-06-28 22:25:24 -07:00
fb22c0556c
内容微调
2016-06-29 13:11:23 +08:00
55dc7c9476
内容微调
2016-06-29 11:18:36 +08:00
fc6e68dc5c
调整首页
...
内容微调
2016-06-29 10:41:21 +08:00
8d7e7a0187
fixed a formatting typo on line 1015
2016-06-28 16:18:12 -07:00
28b5316727
docs(forms): add more to the top of doc warning about bootstrap
2016-06-28 16:08:38 -07:00
8548d3cb06
chore(nav): update left nav to add glossary back
2016-06-28 13:58:30 -07:00
e5b11d456c
docs(guide/attribute-directives): follow-up to #1654 ( #1765 )
...
- Updated Dart code to match TS.
- Ran dartfmt.
- Enabled e2e tests; suites passed:
- public/docs/_examples/attribute-directives/dart
- public/docs/_examples/attribute-directives/ts
- Prose copyedits.
2016-06-28 13:15:51 -07:00
97fbda0d76
docs(toh-6/ts): Upgraded http tutorial to use new router
2016-06-28 13:03:04 -07:00
b049c1bcf4
chore(guide/server-communication): fix indentation in Jade
2016-06-28 12:52:47 -07:00
58d20e57b5
chore: update ngSwitchWhen to ngSwitchCase
...
See https://github.com/angular/angular/commit/e1fcab7
2016-06-28 12:52:47 -07:00
c467d56a2b
Fix typo in first-app-tests.jade
2016-06-28 12:52:47 -07:00
adc04b6830
docs: Change LoggerService to Logger service
...
`LoggerService` implies that it will be written as such in the code, yet the hero.service.ts example has a service simply called `Logger` (which matches the Style Guide).
2016-06-28 12:52:47 -07:00
f3189546a6
docs(toh-5): Upgraded tutorial to new router
2016-06-28 12:52:47 -07:00
2eae445504
docs(template-syntax): correct hyperlink path to API documentation
2016-06-28 12:52:47 -07:00
Zhicheng Wang
Foxandxss
Patrice Chalin
eltronix
Stephen Fox
Zhimin YE (Rex)
Ward Bell
Patrice Chalin
Naomi Black
Filipe Silva
priestch
Fabriece Sumuni
Brandon Roberts
Mark McEahern
Patrick McDonald
Rick Beerendonk