Commit Graph

903 Commits

Author SHA1 Message Date
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
rexebin 642633d0aa patch: patching up testing.jade up to speed, line 1410. 2016-09-23 20:48:34 +01:00
Zhimin YE (Rex) a809a5922e fix: patching up testing.jade line 1133 2016-09-23 17:01:03 +01:00
Zhimin YE (Rex) ef06901f7d merge: testing.jade to the latest. 2016-09-23 15:41:58 +01:00
Zhimin YE (Rex) e5d29e8427 translate: testing.jade line 1204 2016-09-23 13:49:06 +01:00
Zhimin YE (Rex) 77d7804b1e translate: testing.jade line 1130 2016-09-23 11:40:36 +01:00
Ward Bell b478aaf7a2 docs(testing): from Igor Minar feedback (Part 1) (#2450) 2016-09-23 02:03:20 -07:00
rexebin 8178d1abde translate: testing line 1027 2016-09-22 22:04:56 +01:00
rexebin 32462a5af4 translate: testing.jade to line 978 2016-09-22 19:33:03 +01:00
Patrice Chalin 74644d2b3e docs(testing): use marked Jade filter (#2444)
When the testing page is rendered the following warning is generated:
```
Transformers.markdown is deprecated, you must replace the :markdown
jade filter, with :marked and install jstransformer-marked before you
update to jade@2.0.0.
```
2016-09-22 09:48:22 -07:00
Zhimin YE (Rex) 2d2d6e963e translate: testing.jade 对象>工具 2016-09-22 17:04:54 +01:00
Zhimin YE (Rex) 1dd15b1eb3 translate: testing to line 870.
fix: browserSync's scrollRestoreTechnique to 'cookie'
2016-09-22 16:44:13 +01:00
Ward Bell 1c87bd67d8 docs(testing): explain DebugElement.triggerEventHandler (#2438) 2016-09-21 20:01:44 -07:00
rexebin 4364ba9818 translate: testing line 610 2016-09-21 21:32:05 +01:00
Daniel Karp 8870f30a3d docs(typescript): Fix name of typings config file (#2378)
I believe name of the typings config file is typings.json, not typings.config.
2016-09-21 11:33:39 -07:00
Marc Laval c5e02f27a0 docs(browser-support): add Safari 10 (#2433) 2016-09-21 11:30:03 -07:00
Ward Bell 4c71a32e36 docs(testing): import test module and override component providers (#2428) 2016-09-21 11:27:11 -07:00
Jesús Rodríguez fdf517ee6b docs(upgrade): temporary fix broken regions (#2424) 2016-09-21 14:53:43 +02:00
Kapunahele Wong 7252bd1553 docs(animations): update copy (#2379)
* docs(animations): update copy
2016-09-20 14:31:48 -07:00
Ward Bell 55bf126489 docs(testing): explain rationale for stubbed routerLink tests (#2422) 2016-09-20 13:45:50 -07:00
Zhimin YE (Rex) 6a18dbf8e3 translate: testing.jade to line 527 2016-09-20 12:02:34 +01:00
Ward Bell 03680e23bb chore: more "angular2" to "angular" cleanup (#2417) 2016-09-20 11:37:16 +02:00
Jesús Rodríguez 7d45d60c91 docs(overview): update to new organization (#2405) 2016-09-19 21:23:02 -07:00
Jesús Rodríguez 693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
Ward Bell 7b5244ce87 docs(testing): more scenarios (#2396) 2016-09-19 19:57:59 -07:00
Rex c3894a11af translate: testing.jade line 300 2016-09-19 23:06:04 +01:00
Rex 3be4d2721c translate: testing.jade to line 203. 2016-09-19 22:30:28 +01:00
Rex f11a79b3a6 translate: testing.jade, line 130 2016-09-19 19:54:58 +01:00
Zhimin YE (Rex) b74b446b2c fix: upgrade 1 example error. 2016-09-19 17:06:50 +01:00
Zhimin YE (Rex) 0c862667e7 review: browser-support 2016-09-19 15:23:00 +01:00
Zhimin YE (Rex) 054d25cefe fix: toh-pt6 and embeded live example in ngmodule. 2016-09-19 14:48:05 +01:00
Zhimin YE (Rex) 6aeb8efaa3 fix: live example localisation. 2016-09-19 10:03:53 +01:00
Zhimin YE (Rex) 33125b71d3 fix; architecture.jade 2016-09-19 09:48:05 +01:00
Zhimin YE (Rex) 762c7141bc fix: #72 2016-09-19 09:25:25 +01:00
Maxime 40f320d721 docs(testing): fix small typo (#2401) 2016-09-18 18:54:40 +02:00
Zhicheng Wang e36f0a4b1a 更新了小抄 2016-09-18 11:14:15 +08:00
Zhicheng Wang 3845d73234 翻译完了RC4 to RC5
把AoT的中文翻译统一成预编译
2016-09-18 09:42:13 +08:00
Sarun Intaralawan c6cf4dc310 docs(router): add missing backticks (#2366) 2016-09-17 23:56:55 +02:00
Filipe Silva 5bd269484a fix(ngmodule): fix broken anchor (#2373) 2016-09-17 23:56:36 +02:00
Ward Bell 84b5297cc2 docs(testing): feedback from Joe Eames/add more scenarios (#2391) 2016-09-17 12:44:34 -07:00
rexebin 7ca9e1159e review: first review of ngmodule.jade is done. 2016-09-17 19:44:46 +01:00
rexebin b9b5c7bd64 fix: 首页图标bug
review: ngmodule to line 1821
2016-09-17 19:35:22 +01:00
Zhicheng Wang ba3152bb88 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/guide/style-guide.jade
2016-09-17 12:01:41 +08:00
Zhicheng Wang 6f6f89ed9c 把所有“内建”改为“内置” 2016-09-17 11:46:17 +08:00
Zhicheng Wang 50f73986be 翻译完了NgModule FAQ
少量错别字修改
2016-09-17 11:45:56 +08:00
Pete Bacon Darwin c787fd2ff0 docs(testing-guide): fix tiny typo (#2381) 2016-09-16 23:41:49 +02:00
Zhimin YE (Rex) 79ca5433f5 review: ngmodule(line 1672) 2016-09-16 17:01:51 +01:00
Zhicheng Wang 9a2aa3cc7d 找回一些丢失的翻译 2016-09-16 16:01:59 +08:00
Zhicheng Wang 96bfb764a1 翻译了一部分未翻译的合并 2016-09-16 15:50:21 +08:00
Zhicheng Wang bd29d09085 翻译了一部分未翻译的合并 2016-09-16 13:21:27 +08:00
Patrice Chalin f0ff5e26bd docs(style-guide): attributes aren't comma separated (#2372)
A fix necessary for ng2.io
2016-09-15 17:18:41 -07:00
Zhimin YE (Rex) 35a1cce5dc review: ngmodule.jade to line 700 2016-09-15 16:56:39 +01:00
Zhicheng Wang e693d35fb1 合并了最新更新,翻译了官方的发布声明 2016-09-15 17:08:17 +08:00
Zhicheng Wang 2417245114 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_hero.jade
#	public/_includes/_main-nav.jade
#	public/_includes/_util-fns.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/_data.json
#	public/docs/ts/latest/testing/application-under-test.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/index.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/index.jade
#	public/resources/css/main.scss
#	public/resources/css/module/_side-nav.scss
2016-09-15 15:23:48 +08:00
Naomi Black 053ecc2b10 docs(aot): More consistency edits to aot/jit 2016-09-14 13:55:23 -07:00
Brandon Roberts c15a68e591 docs(router): Added and organized more router dev guide content
Moved all heroes functionality into milestone 2
Crisis Center initial functionality is milestone 3
Admin feature module as milestone 4 including route guard examples
Updated milestone 5 to lazy load admin feature module
Added examples for CanLoad, CanActivateChildren guard, component-less routes
Added section on explanation of ActivatedRoute
Added section on animating route components
Added section on relative navigation
2016-09-14 13:46:16 -07:00
Kapunahele Wong 97736ad5ee Security Edits Combined (#2245)
* Security Edits Combined

* Security copy edits

* Fix typo in security

* fixing trailing whitespace
2016-09-14 09:11:53 -07:00
Zhicheng Wang 551f3dd51a 更新了cheatsheet
翻译了一部分FAQ
2016-09-14 21:12:14 +08:00
Zhicheng Wang f5a154e012 文字微调 2016-09-14 13:49:54 +08:00
Zhicheng Wang e71848b664 翻译完了浏览器支持 2016-09-14 13:12:05 +08:00
Benjamin Dopplinger d858ed379a docs(server-communication): fix "app/app.module.ts" typo
closes #2283
2016-09-13 20:52:26 -07:00
Deborah Kurata a52d8c3e76 docs(validation): Change to 'Table of Contents'
Same change to NgModules
closes #2315
2016-09-13 20:46:36 -07:00
John Papa 39c5a2b949 Rc5 doc sweep (#2218)
* Removed 03-05, 04-12, 04-15.

Removed style for whitespace in imports.

Removed + sign prefix for routing folders. Updated all code.

Removed style that said to use lazy loading.  There was no value in the style other than use it :)

* renamed componet router to router
2016-09-13 18:51:03 -07:00
Ward Bell 1fb488b4ec docs: delete forms- and router-deprecated, jade + examples (#2328) 2016-09-13 18:49:51 -07:00
Jonathan Persson f2b1bbaba9 Remove a superfluous `.` in HTTP client docs 😄 (#2313) 2016-09-13 16:13:44 -07:00
Shai Reznik 3c9ff061c6 docs(server-communication): fix small typo (#2312) 2016-09-13 15:58:39 -07:00
Jesús Rodríguez 08ae41019e docs(animation): add callbacks documentation (#2271) 2016-09-13 15:57:58 -07:00
Kapunahele Wong c5a1a88042 a1-a2 quick ref copy edits (#2255)
* a1-a2 quick ref copy edits

* copy edits, 2nd pass

* Glossary Edits

* 1-2 quick ref copy edits, pass 2
2016-09-13 14:56:29 -07:00
Ward Bell 07cfce795f docs(testing): testing chapter and samples for RC6 (#2198)
[WIP] docs(testing): new chapter, new samples
2016-09-13 14:39:39 -07:00
Jesús Rodríguez d1987b183b docs(di): remove InjectorMetadata mentions 2016-09-13 09:41:38 -07:00
Zhicheng Wang 2a1c3626c5 去掉了大部分儿化音
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
Zhicheng Wang 67052ac925 fix: 英文不自动隐藏
#50
2016-09-12 08:18:24 +08:00
Zhicheng Wang 3d40a26655 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/quickstart.jade
2016-09-11 21:20:58 +08:00
Zhicheng Wang 8a7165acf5 对上次的合并查漏补缺 2016-09-10 20:44:57 +08:00
Zhicheng Wang ab06793705 对上次的合并查漏补缺 2016-09-10 18:31:38 +08:00
Zhicheng Wang 446acfd81b 对上次的合并查漏补缺 2016-09-10 18:07:25 +08:00
Zhicheng Wang 40523db212 翻译完了《Angular模块》 2016-09-10 18:01:58 +08:00
Ward Bell 01b211193c docs(browser-support): edits (#2299) 2016-09-09 22:21:40 -04:00