2893 Commits

Author SHA1 Message Date
rexebin
41c22a465c translate: testing line 2844 2016-09-25 21:33:43 +01:00
rexebin
6a3f9614d0 remove 一个 2016-09-25 19:58:46 +01:00
rexebin
9c090cc19f remove 一个 from quickstart 2016-09-25 19:55:07 +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
Jesús Rodríguez
90100bffd9 chore: ability to add unit test boilerplate (#2462) 2016-09-24 21:03:08 +02: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
Alex Wolfe
4bb79953be Merge pull request #2075 from jackmu95/fix-styleguide-trigger-positioning
fix(footer): Improve styleguide trigger positioning
2016-09-23 11:09:17 -07:00
Jacob Müller
8d713f1574 Use solid color and transition to red color on hover 2016-09-23 19:44:14 +02:00
Zhimin YE (Rex)
a809a5922e fix: patching up testing.jade line 1133 2016-09-23 17:01:03 +01:00
Zhimin YE (Rex)
3e1408792e Merge branch 'master' of https://github.com/angular/angular-cn 2016-09-23 15:42:09 +01:00
Zhimin YE (Rex)
ef06901f7d merge: testing.jade to the latest. 2016-09-23 15:41:58 +01:00
雪狼
68332aa41c Merge pull request #77 from xueron/xueron
修正一个笔误:重新编译
2016-09-23 08:32:31 -05: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
Jacob Müller
c8b2c39409 Align footer text left on desktop 2016-09-23 08:58:06 +02:00
Alex Wolfe
37cebe9746 Merge pull request #2272 from LayZeeDK/patch-1
fix(footer): Footer logo is overflowing
2016-09-22 21:19: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
Alex Wolfe
c348e8332d Merge pull request #2427 from ericjim/fix-sidenav-transparency
fix: boost transparency of sidenav
2016-09-22 11:10:55 -07: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
Trotyl Yu
6bf7db584c docs(vs2015): fix typo (#2440) 2016-09-22 11:42:16 +02:00
Trotyl Yu
aab6d8c523 docs(vs2015): remove duplicated word (#2441) 2016-09-22 11:40:35 +02:00
倪述荣
1f47f27c9e 修正一个笔误:重新编译 2016-09-22 15:27:49 +08: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
Tomas Echeverri Valencia
c8121d61dd docs(quickstart): Change Npm to npm (#2398) 2016-09-21 11:32:36 -07:00
Prashant Mahajan
36c7224ff9 Update visual-studio-2015.jade (#2416)
* Update visual-studio-2015.jade

In Step 7 (Build and Run App), there needs to be instruction to set index.html as start page, so that when Run button or F5 is pressed to run the application, browser shows index.html

* Update visual-studio-2015.jade
2016-09-21 11:32:07 -07:00