980 Commits

Author SHA1 Message Date
Zhicheng Wang
032ac9c337 typo 2016-10-02 16:43:49 +08:00
Zhicheng Wang
dca47cbb1a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/_examples/quickstart/ts/package.1.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-10-02 10:39:25 +08:00
Ward Bell
56ac24b411 chore: fix broken links on 9/30, mostly API links (#2520) 2016-10-01 07:11:21 -07:00
Alireza Mirian
7796f485fd fix(guide/form): fix a broken link (#2498) 2016-09-30 23:33:26 +02:00
Jonas Felix
c548f9700b docs(style-guide): add missing word in bootstrapping remark (#2512) 2016-09-30 23:30:20 +02:00
Chase
98d438ed9b docs(testing): delete extra 'with' (#2513)
Deleted extra 'with'
2016-09-30 23:29:49 +02:00
Chase
1591bcc0e1 docs(testing): fix link (#2514)
Fixed link
2016-09-30 23:29:16 +02:00
Chase
4f9f51cb4b Fixed minor typos in testing (#2515)
Fixed minor typos in testing
2016-09-30 23:28:45 +02:00
Zhicheng Wang
54d1be2e5a 把angular2-in-memory-web-api改名为angular-in-memory-web-api
#84
2016-09-30 21:38:44 +08:00
Ward Bell
e6199a8dfb docs(i18n): add internationalization (i18n) guide (#2491)
* docs(i18n): add internationalization (i18n) guide

* docs(cb-i18n): revamped to System.import the translation file
2016-09-29 11:15:55 -07:00
Cody Lundquist
480a824214 docs(style-guide): Fix a couple typos
closes #2489
2016-09-27 12:03:42 -07:00
guichi
ba5e194acd Update router.jade
改正错误
2016-09-27 16:25:02 +08:00
Jesús Rodríguez
66c630df99 docs(upgrade): update to latest release + tweaks (#2460) 2016-09-27 01:22:38 -07:00
Alireza Mirian
e82f28b844 fix(guide/form): fix a typo (#2483) 2016-09-27 00:59:45 -07:00
John Papa
2b7fb86890 docs(style-guide): remove rc relics and update for ngmodules (#2463) 2016-09-27 00:58:10 -07:00
Zhicheng Wang
e87772f5d5 改正错误
#82
2016-09-27 10:15:33 +08:00
Zhicheng Wang
843351d8b7 改正错误
#82
2016-09-27 10:08:35 +08:00
Ward Bell
62d16a8968 docs(architecture): remove reference to directives in component metadata (#2481) 2016-09-26 13:52:57 -07:00
Zhimin YE (Rex)
72ebe97ee8 fix: lifecycle-hooks.jade. 2016-09-26 15:56:44 +01:00
Zhimin YE (Rex)
1523fedcf0 Merge remote-tracking branch 'origin/master' 2016-09-26 15:15:09 +01:00
Zhimin YE (Rex)
a18aa9ec01 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-09-26 15:14:39 +01:00
Zhicheng Wang
623c799771 微调,增补了社区贡献者 2016-09-26 20:44:35 +08:00
Josh Kramer
9970094fcb Fix broken link to DatePipe docs (#2452)
Fixes issue #2451
2016-09-25 18:55:14 -07:00
Ward Bell
6def9505cc chore: convert templateUrls to use moduleId where possible. (#2477) 2016-09-25 18:51:54 -07:00
Ward Bell
6e17d33475 chore: update samples to "angular-in-memory-web-api" (#2472)
chore: update samples to "angular-in-memory-web-api"
2016-09-25 15:24:13 -07:00
Jesús Rodríguez
738b714bd3 docs(testing): change createInstance to createComponent (#2475) 2016-09-25 15:12:04 -07:00
Ward Bell
3ee19780b5 docs(testing): incorporate Igor Minar feedback, Part 2 (#2453)
docs(testing): incorporate Igor Minar feedback, Part 2
2016-09-25 15:07:53 -07:00
rexebin
a2c21bf10f translate: testing, line 3116 2016-09-25 22:40:45 +01:00
rexebin
59aba1c942 translate: testing.jade to line 3109 2016-09-25 22:36:27 +01:00
rexebin
41c22a465c translate: testing line 2844 2016-09-25 21:33:43 +01:00
rexebin
f7c60a07df fix: change all 他 > 它 2016-09-25 19:50:45 +01:00
rexebin
04ac213aa8 fix: testing.jade remove 一个 2016-09-25 19:48:57 +01:00
rexebin
db250362fe translate: testing.jade line 2506 2016-09-25 12:29:01 +01:00
rexebin
529a34995c Merge branch 'master' of https://github.com/angular/angular-cn 2016-09-25 12:17:06 +01:00
rexebin
907e435c5d translate: testing.jade to line 2438 2016-09-25 12:16:22 +01:00
Zhicheng Wang
517e3bb8e9 改正vaanxy网友指出的两处错误
#79
2016-09-25 17:57:07 +08:00
Ward Bell
f45c9998cc docs(lifecycle-hooks): combine what and when in one chart; add img (#2469) 2016-09-24 15:50:21 -07:00
rexebin
620c6dc48c alter: testing: stub > stub类 2016-09-24 22:39:37 +01:00
Ward Bell
ac0e82cda7 docs(js/guide): don't use shredder & _data.json fixes (#2467)
replay Patrice's PR #2448
2016-09-24 14:30:06 -07:00
rexebin
d3b1c3628e translate: testing to line 2150 2016-09-24 22:28:06 +01:00
rexebin
b848c86570 translate: testing.jade line 1920 2016-09-24 21:05:27 +01:00
rexebin
a324674968 translate: testing.jade line 1842 2016-09-24 20:37:30 +01:00
Ward Bell
f5f1e80bb7 docs(lifecycle-hooks): make it easier to get to call sequence (#2465)
Per Ben Lesh suggestion. Also converts away from "we"
2016-09-24 12:37:22 -07:00
rexebin
afd45168b4 translate: testing.jade to line 1615. 2016-09-24 18:34:59 +01:00
rexebin
3b73d04169 translate: testing line 1500 2016-09-24 12:42:05 +01:00
Kapunahele Wong
6c7f330620 docs(Displaying Data): copy edits (#2435) 2016-09-23 16:53:50 -07:00
rexebin
a59b1b60ee Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/testing.jade
2016-09-23 23:22:42 +01:00
rexebin
acead8a078 merging testing.jade with angular.io master 2016-09-23 23:07:18 +01:00
rexebin
3c49c10c12 fix: testing.jade. 2016-09-23 22:23:19 +01:00
rexebin
d9af771f8d Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/_includes/_ts-temp.jade
#	public/docs/index.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/support.jade
2016-09-23 22:13:02 +01:00