1405 Commits

Author SHA1 Message Date
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
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