Commit Graph

90 Commits

Author SHA1 Message Date
rexebin afc17dce11 快速开始 -> 快速起步 2016-11-27 10:41:55 +00:00
rexebin 26100f95f6 搭建 -> 搭建本地开发环境 2016-11-27 10:38:15 +00:00
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
Yang Lin 5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08:00
Zhimin YE 4578087fa5 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	harp.json
#	public/_includes/_hero-home.jade
#	public/docs/_examples/quickstart/ts/systemjs.config.1.js
#	public/docs/dart/latest/_util-fns.jade
#	public/docs/dart/latest/api/_data.json
#	public/docs/dart/latest/api/index.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.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/change-log.jade
#	public/docs/ts/latest/guide/npm-packages.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/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/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade

Server Communication and Visual studio 2015 require further merging.
2016-11-03 15:38:23 +00:00
Ward Bell 48cd008749 docs(testing): 'testingService' -> 'twainService' plus clarity (#2692) 2016-10-28 12:40:43 -07:00
Zhimin YE d44915f0a7 first review: testing.jade is done. 2016-10-26 16:52:34 +01:00
Zhimin YE 4349c424d6 review: testing 3549 2016-10-25 16:56:10 +01:00
Zhimin YE 535161225b review: testing 3543 2016-10-25 16:52:43 +01:00
Zhimin YE fb75d67052 review testing line 3480 2016-10-25 16:50:10 +01:00
Zhimin YE 7893c42b53 review: testin 3463 2016-10-25 16:49:13 +01:00
Zhimin YE 0957c70caf review testing 3239 2016-10-25 16:38:16 +01:00
Zhimin YE de8efbaf4e review testing. 2016-10-25 16:14:07 +01:00
Zhimin YE e139832320 review testing 2016-10-25 16:08:31 +01:00
Zhimin YE 7b7487902c review: testing 2016-10-25 15:32:47 +01:00
Zhimin YE d84a1b95dd review testing 2016-10-25 15:32:30 +01:00
Zhimin YE ee9bae0112 review testing 2016-10-25 12:52:44 +01:00
Zhimin YE ac674f009b review: testing 2750 2016-10-25 10:35:58 +01:00
Zhimin YE a4d66dfc07 review testing 2644 2016-10-25 10:26:30 +01:00
Zhimin YE f6598097c8 Merge branch 'master' of https://github.com/angular/angular-cn 2016-10-25 10:12:31 +01:00
Zhimin YE 860334177b review tesing 2016-10-25 10:12:28 +01:00
rexebin 50ad8c189a review: to line 2494 2016-10-24 22:32:17 +01:00
rexebin aa2d4e629f review: testing. 2016-10-24 22:20:42 +01:00
rexebin f500220488 fix: testing 2016-10-24 21:43:04 +01:00
rexebin 368193ba34 fix: testing.jade table. 2016-10-24 21:00:17 +01:00
Zhimin YE 3de420bf48 review 2016-10-24 15:03:23 +01:00
Zhimin YE 8aa8c11697 review: tesing. 2016-10-24 14:55:43 +01:00
Zhimin YE 3697cedeaa review: 一些测试->测试程序 2016-10-24 12:58:39 +01:00
Zhimin YE 865a0934bd review: testing.jade 2016-10-24 12:10:45 +01:00
Ward Bell 101265cba4 chore(testing): fix broken input/output link (#2638) 2016-10-19 23:29:06 -07:00
rexebin f8b80ad3e5 translate: testing is done. 2016-10-18 21:48:48 +01:00
SangKa 5774909946 (测试一章):修复错别字 2016-10-18 22:05:23 +08:00
SangKa 232196e6b2 (测试一章):文字优化 消除歧义 2016-10-18 22:04:52 +08:00
Zhimin YE 183633b0e3 fix: router and testing 2016-10-18 14:57:39 +01:00
Maurice de Beijer 6ece848443 docs(testing): fix broken links (#2624) 2016-10-18 15:17:14 +02:00
SangKa.Z 4f15b4ebdc docs(testing): fix hash link (#2609) 2016-10-18 15:07:37 +02: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
Rex 020722e3ea translate: 3450 2016-10-05 21:44:04 +01:00
Rex 08ef04a968 fix: override 2016-10-05 20:54:19 +01:00
Rex ad01e61fb3 translate: testing.jade to line 3266 2016-10-02 22:13:04 +01:00
Chase 98d438ed9b docs(testing): delete extra 'with' (#2513)
Deleted extra 'with'
2016-09-30 23:29:49 +02:00
Chase 1591bcc0e1 docs(testing): fix link (#2514)
Fixed link
2016-09-30 23:29:16 +02:00
Chase 4f9f51cb4b Fixed minor typos in testing (#2515)
Fixed minor typos in testing
2016-09-30 23:28:45 +02:00
Zhimin YE (Rex) a18aa9ec01 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-09-26 15:14:39 +01:00
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