honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,106 Commits 5 Branches 1 Tag
Commit Graph

1472 Commits

Author SHA1 Message Date
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)
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
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
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
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
Jesús Rodríguez
fdf517ee6b docs(upgrade): temporary fix broken regions (#2424) 2016-09-21 14:53:43 +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
biolee
67e1b69575 Angular 2词汇表 原文也错了 
每个 Angular 应用程序都有一个应用程序根模块类。按规约这个类的名字为 AppModule ，存放在名为 app.component.ts 的文件。
->
每个 Angular 应用程序都有一个应用程序根模块类。按规约这个类的名字为 AppModule ，存放在名为 app.module.ts 的文件。
 2016-09-21 17:02:50 +08: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
Patrice Chalin
0f99a7c130 docs(cookbook): don't use shredder on intro page (#2418) 
Also added missing cookbook AoT chapter placeholders for JS and Dart,
fixing 404s mentioned in #2389.
 2016-09-20 10:59:14 -07:00
Patrice Chalin
b2c6acf1ad docs(tutorial): fix broken link (#2420) 
Fixes #2419
 2016-09-20 10:56:38 -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
Patrice Chalin
98efced068 docs(lang/latest): parameterize landing page Jade by language (#2389) 
ng2.io preparatory work.
 2016-09-19 20:14:31 -07:00
Patrice Chalin
0c678c2355 docs: use Jade include rather than Harp partial (#2392) 
No net effect on the generated docs.
Preparatory work for ng2.io.
 2016-09-19 20:08:03 -07:00
Ward Bell
7b5244ce87 docs(testing): more scenarios (#2396) 2016-09-19 19:57:59 -07:00
Patrice Chalin
e016f3f31e docs(tutorial): don't use shredder for intro page (#2388) 
An initial multilang cleanup for ng2.io
 2016-09-19 16:56:17 -07:00
Patrice Chalin
d26007aa67 docs: fix {ts,dart,js}/latest/_data.json (#2387) 
* docs: fix {ts,dart,js}/latest/_data.json

Fixes #2384.
Fixes #2385.

* post-review updates

Addressing #2407.
 2016-09-20 00:52:41 +02: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)
94d48f2b95 fix: toh1 and 2 2016-09-19 10:00:09 +01:00