Commit Graph

2827 Commits

Author SHA1 Message Date
rexebin 620c6dc48c alter: testing: stub > stub类 2016-09-24 22:39:37 +01: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
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
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
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
Eric Jimenez af4dabb413 only apply transparency changes on mobile 2016-09-21 11:56:19 -04:00
Patrice Chalin 36a3ea2c21 docs(user-input): misc fixes (#2430)
- Remove nonexistent `<important>` “element” since it causes problems
for ng2.io. This is probably a typo. It was more likely meant to be an
anchor name than an element name.
- Fix two PENDING links.
2016-09-21 08:48:38 -07:00
Patrice Chalin 8d756808b9 docs(toh-6): remove BrowserClient provider comment (#2431)
Fixes #2347
2016-09-21 08:47:09 -07:00
Jacob Müller 0bae5fca69 Merge branch 'pr/2' into fix-styleguide-trigger-positioning 2016-09-21 16:21:50 +02:00
Jacob Müller 9a338b659e Some more cleanup 2016-09-21 16:11:12 +02:00
Jacob Müller 8a4a80033e Fix up styles after sync 2016-09-21 15:32:11 +02:00
Jesús Rodríguez fdf517ee6b docs(upgrade): temporary fix broken regions (#2424) 2016-09-21 14:53:43 +02:00
Jesús Rodríguez fe220a5cab chore: fix zone.js for plunkers (#2421) 2016-09-21 14:19:22 +02:00
Rex e847581b23 Merge pull request #71 from Hellowor1d/fix-spell-mistake
rename style.css to styles.css ,add "s"
2016-09-21 12:28:26 +01:00
Rex a904c27dd4 Merge pull request #75 from biolee/master
AppModule 在 app.module.ts内 原文也错了
2016-09-21 12:27:40 +01:00
biolee 67e1b69575 Angular 2词汇表 原文也错了
每个 Angular 应用程序都有一个应用程序根模块类。按规约这个类的名字为 AppModule ,存放在名为 app.component.ts 的文件。
->
每个 Angular 应用程序都有一个应用程序根模块类。按规约这个类的名字为 AppModule ,存放在名为 app.module.ts 的文件。
2016-09-21 17:02:50 +08:00
Eric Jimenez 5a203d6b36 boost transparency of sidenav 2016-09-20 20:54:39 -04:00