107 Commits

Author SHA1 Message Date
Zhicheng Wang
82b184b549 fix: 修正一些重复的英文内容 2017-03-03 15:09:21 +08:00
Zhicheng Wang
7711fa6557 不再使用li进行切换,而是全面转换到li内嵌p元素 2017-02-26 21:44:00 +08:00
Zhicheng Wang
e11efe4aef 微调 2017-02-26 20:56:36 +08:00
Zhicheng Wang
6af595d7bd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/dart/latest/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.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/appmodule.jade
#	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/component-styles.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/hierarchical-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/pipes.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/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.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/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.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
#	public/events.jade
#	public/presskit.jade
#	public/resources/js/directives/cheatsheet.js
2017-02-26 15:39:42 +08:00
Filipe Silva
1101f07ef2 refactor: add src folder (#3171)
* boilerplate, gulpfile, quickstart

* move ts files up to cookbooks

* move rest of ts files

* fix tsconfig, default build task, json file

* fix js examples

* fix webpack example

* remove a2docs.css references

* fix aot examples

* fix webpack run task

* fix cb-i18n

* fix upgrade examples

* fix unit tests

* fix comment in deployment index

* removed unused typings.json

* fix plunkers

* fix js example paths

* fix ts quickstart/setup prose

* add src folder note to setup

* broadly replace app/ -> src/app/

* broadly replace main.ts

* broadly replaced index.html

* broadly replace tsconfig

* replace systemjs

* fix filetrees

* Minor prose fixes to aot, i18n cookbooks

* remove char harp was complaining about

* update new reactive forms example

* fix quickstart jade error

* fix mistakes uncovered by CI

* fix bad filename errors

* edit style guide 04-06 rule to use src

* add changelog

* Incorporate Jesus's feedback

* fix snippet headers in toh1/2

* chore: tweak changelog and setup text
2017-02-02 19:38:17 +01:00
Shai Reznik
a7f2b644ea Changed the wording to reflect new location (#3177) 2017-02-01 21:34:04 -08:00
Lukas Ruebbelke
039caf36d6 docs(style-guide): fix typo (#3120) 2017-01-26 22:56:51 -08:00
Hongbo Miao
361361f195 fix link 2016-12-07 15:07:25 +08:00
Ward Bell
cd80df8dc7 docs(testing): make the StubHeroDetailService a spy-stub (#2935) 2016-12-06 18:16:32 -08:00
Ward Bell
695df67929 docs(testing): simplify and accelerate path to Angular component testing (#2879)
Rob Wormald recognized that we had no plunker for a simple component test. Inspired improved learning path for testing including:
* Add plunkers for both inline and external template versions of  the simplest `BannerComponent`
* Added the banner-specs for that purpose and also a quickstart-specs in the setup folder
* Adjusted prose in testing and setup-systemjs-anatomy to call these out
* Moved testing of external template spec earlier in the guide because it is likely to be needed right away.
* Add comments on the optional "testing" folder and corrects var names to match
* Leaves Jasmine Spec Runner output visible when tests finish
2016-12-05 11:46:53 -08:00
Kapunahele Wong
4a536732bc docs(renderer): remove renderer (#2925) 2016-12-02 16:54:27 -08:00
ashishg-qburst
424645e1df docs: fix broken link on testing guide (#2887) 2016-11-27 23:09:58 -08:00
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
Ward Bell
ec2e6cb2c7 [WIP] docs(quickstart): QuickStart reboot (#2762) 2016-11-21 17:36:16 -08:00
Ward Bell
a7525721c0 Revert "[WIP] docs(quickstart): QuickStart reboot (#2762)"
This reverts commit 8ccc33e6ffacd7a0acdfc49aab2e6fdecf627fa9.
2016-11-21 17:29:00 -08:00
Ward Bell
8ccc33e6ff [WIP] docs(quickstart): QuickStart reboot (#2762) 2016-11-21 17:13:21 -08:00
Patrice Chalin
061e50fa06 docs: adjust page heading levels (#2813)
* docs: adjust page heading levels

Only the page TOC should be at heading level 1. All other headings
should start at level 2. This commit also removes duplicate headings,
in continuation of #2796.

(This fix is necessary to support an auto-TOC feature.)
2016-11-16 10:02:31 -08:00
Pavol Pitonak
60565a5cf1 docs(testing): configureTestModule -> configureTestingModule (#2767) 2016-11-09 17:42:57 +01: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