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

90 Commits

Author SHA1 Message Date
rexebin
edda524d0d Merge remote-tracking branch 'angular.io/master' 
# Conflicts:
#	.travis.yml
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_next-item.jade
#	public/_includes/_util-fns.jade
#	public/_includes/_version-dropdown.jade
#	public/docs/_examples/package.json
#	public/docs/_examples/quickstart/dart/lib/app_component.dart
#	public/docs/_examples/quickstart/e2e-spec.ts
#	public/docs/_examples/quickstart/js/app/app.component.js
#	public/docs/_examples/quickstart/ts/app/app.component.ts
#	public/docs/_examples/quickstart/ts/index.html
#	public/docs/_examples/toh-5/dart/lib/dashboard_component.html
#	public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
#	public/docs/dart/latest/_util-fns.jade
#	public/docs/dart/latest/guide/_data.json
#	public/docs/dart/latest/guide/index.jade
#	public/docs/dart/latest/quickstart.jade
#	public/docs/index.jade
#	public/docs/js/latest/quickstart.jade
#	public/docs/ts/_cache/glossary.jade
#	public/docs/ts/_cache/guide/dependency-injection.jade
#	public/docs/ts/_cache/guide/index.jade
#	public/docs/ts/_cache/quickstart.jade
#	public/docs/ts/_cache/tutorial/toh-pt5.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/_quickstart_repo.jade
#	public/docs/ts/latest/cli-quickstart.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.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/user-input.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/events.jade
#	public/resources/images/devguide/quickstart/hello-angular.png
#	scripts/cache.sh
#	tools/plunker-builder/indexHtmlTranslator.js
 2016-11-26 21:43:16 +00:00
rexebin
6c0606469d review di. 2016-11-26 17:11:47 +00:00
Yang Lin
13ed4d265e More whitespaces 2016-11-27 00:48:54 +08:00
Yang Lin
1aeb6b9c82 Polish dependency-injection.jade 2016-11-27 00:30:27 +08:00
rexebin
d913092f99 add addSpacingBetweenCnAndEn 2016-11-24 20:42:38 +00:00
Yang Lin
5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08:00
rexebin
ce3930b2c0 Merge remote-tracking branch 'remotes/angular.io/master' 
# Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.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/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
 2016-10-17 22:48:18 +01:00
Zhicheng Wang
41b0cc800b 更正了technically的翻译 2016-10-06 20:37:42 +08:00
Alireza Mirian
7796f485fd fix(guide/form): fix a broken link (#2498) 2016-09-30 23:33:26 +02:00
rexebin
f7c60a07df fix： change all 他 > 它 2016-09-25 19:50:45 +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
Jesús Rodríguez
693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
Zhimin YE (Rex)
6aeb8efaa3 fix: live example localisation. 2016-09-19 10:03:53 +01:00
Zhicheng Wang
bd29d09085 翻译了一部分未翻译的合并 2016-09-16 13:21:27 +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
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
ab06793705 对上次的合并查漏补缺 2016-09-10 18:31:38 +08:00
Zhicheng Wang
969da7d321 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/homepage-hello-world/ts/index.1.html
#	public/docs/_examples/homepage-tabs/ts/index.1.html
#	public/docs/_examples/homepage-todo/ts/index.1.html
#	public/docs/_examples/systemjs.config.plunker.build.js
#	public/docs/_examples/systemjs.config.plunker.js
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/features.jade
#	public/resources/js/directives/live-example.js
#	tools/plunker-builder/indexHtmlTranslator.js
 2016-09-08 17:20:01 +08:00
Patrice Delorme
1e0bd22d57 docs(DI): fixed Url of "Should I add providers to the root AppModule or the root AppComponent?" 
closes #2251
Fixed url "Should I add providers to the root AppModule or the root AppComponent?" to proper link : NgModule to NgModule-FAQ
 2016-09-03 12:08:41 -07:00
supeRodv2
f1883df6f0 通过 useClass 来把 OldLogger 作为 NewLogger 的别名 2016-09-01 14:02:25 +08:00
Patrice Chalin
014883d074 docs(*): fix links to Dart API entries (#2185) 
* docs(*): fix links to Dart API entries

* post-review updates
 2016-08-24 14:46:06 -07:00
Zhimin YE (Rex)
2e837b8f19 review: patch up new paragraphs for dependency-inject.jade. 2016-08-16 11:03:25 +01:00
Zhicheng Wang
94aa3664ab Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.gitignore
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
 2016-08-12 07:57:51 +08:00
Peter Bacon Darwin
d79adb2422 docs(rc5): update docs and plunkers for rc5 2016-08-09 11:48:07 -07:00
Zhicheng Wang
7916ec4c8d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/upgrade.jade
 2016-07-26 17:45:25 +08:00
Ignat Shining
fc1a9a6026 docs(dependency-injection): Clarify how TypeScript generates decorator metadata 
closes #1960
 2016-07-25 10:40:56 -07:00
Zhimin YE (Rex)
0e14785cba Merge remote-tracking branch 'angular.io/master' 
# Conflicts:
#	README.md
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-07-15 15:52:34 +01:00
dreamapple
68e7149742 翻译的一点修改: _logger修改为logger 2016-07-14 14:31:17 +08:00
Patrice Chalin
98e5d4af77 docs(all): link cleanup - broken and outdated 
closes #1841
Fixes all broken links except genuine errors (see #1840), have been
resolved as of 2016-07-06
(https://github.com/angular/angular/commit/2708ce6a17667a2369c83bcf244c9
366b058d4c9).

Fixes #1574
 2016-07-11 21:50:07 -07:00
Zhicheng Wang
6264d3bcde 批量把Provider/provide改译为提供商/提供，以和ISP（互联网服务提供商）的译法看齐 2016-07-07 08:22:36 +08:00
Zhicheng Wang
0303a18020 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
 2016-07-07 08:15:51 +08:00
Patrice Chalin
b0e0d94b5c docs: revert Jade to markdown 
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
 2016-07-05 23:03:30 -07:00
Zhicheng Wang
21fe9dc1d2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade
 2016-07-01 08:24:23 +08:00
priestch
b21c90c358 fix(doc): fix 404 problem of some api url 2016-06-28 22:25:24 -07:00
Zhicheng Wang
64b9e476fb 把alternative统一改为备选或替代品（取决于语境） 2016-06-21 07:54:34 +08:00
Zhicheng Wang
bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhicheng Wang
c802c2b5dc 来自网友张旋和Z的修改意见 2016-06-13 17:20:08 +08:00
Zhicheng Wang
6b8e09bf2b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/guide/dependency-injection.jade
 2016-06-10 13:34:18 +08:00
Patrice Chalin
3c77a7fcd1 docs(basics/di): minor edits following TS switch to provider object literal (#1600) 
Minor edits:
- Dart side adjustments following #1594.
- Renamed example '3a' to just '3' and tweaked the logger message
- Removed obsolete Dart block.
 2016-06-08 09:25:48 -07:00
Zhicheng Wang
82f5b1c035 根据 [Joeylin] 的反馈意见，做出微调 2016-06-05 06:39:39 +08:00
Zhimin(Rex) YE
cb8818f171 patch up guide\dependency-injection.jade after official updates. 2016-06-04 19:54:25 +01:00
Zhimin(Rex) YE
633964ac2f Merge remote-tracking branch 'remotes/angular.io/master' 
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/upgrade.jade
 2016-06-04 17:52:51 +01:00
Zhimin(Rex) YE
5ae026ced3 Merge remote-tracking branch 'remotes/angular.io/master' 
# Conflicts:
#	public/docs/_examples/dependency-injection/ts/app/main.1.ts
#	public/docs/ts/latest/guide/dependency-injection.jade
 2016-06-04 16:45:10 +01:00
Foxandxss
c185c3548c chore: use the provide object literal 
closes #1594
replace `provide(...{use:...})` with `{provide: ..., use...}` syntax
 2016-06-04 01:33:36 -07:00
Patrice Chalin
05864c2584 docs(dependency-injection): revised Dart and TS code and prose (#1573) 
docs(dependency-injection): revise Dart and TS code and prose
 2016-06-03 11:16:46 -07:00
Zhimin YE (Rex)
72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master' 
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-06-01 09:51:27 +01:00
Vikash
8569479423 docs: fix numerous typos in many doc files. 
closes #1509
 2016-06-01 01:08:56 -07:00
Zhicheng Wang
bea07ebfca 微调 2016-06-01 11:21:18 +08:00
Zhimin YE (Rex)
070dd1c9e1 guide/di review is done. 2016-05-31 15:40:05 +01:00