Commit Graph

16 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 d398150573 翻译变更记录。 2016-11-03 16:41:27 +00: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
Filipe Silva 4c85f0a91d chore: update to 2.1.1 (#2650) 2016-10-21 22:31:09 +01:00
Ward Bell 14c01fb651 docs(change-log): notes in-mem-web-api breaking change (#2644) 2016-10-20 19:28:19 -07:00
Ward Bell 82933bad47 docs(change-log): update for move to @typings (#2643) 2016-10-20 17:24:50 -07:00
Ward Bell 870ce124d2 docs(template-syntax): explain basic two-way binding (#2639)
closes issue #2598
2016-10-20 10:56:17 -07:00
Zhimin YE 03cb1c5689 translate: change-log done 2016-10-20 11:50:10 +01:00
Ward Bell 0f9a00f144 docs(changelog): fix title in v.2.1.0 announcement (#2591) 2016-10-12 15:32:12 -07:00
Ward Bell 7b509de819 docs(changelog): in-sync with Ng v.2.1.0 (#2590) 2016-10-12 15:29:28 -07:00
Torgeir Helgevold cdfe957ab8 docs(toh-6-aot): add aot to toh-6 (#2496)
* docs(toh-6-aot): add aot to toh-6

s

s

s

s

s

* docs(toh-6-aot): add aot to toh-6

* docs(toh-6-aot): make aot e2e tests run in the same project
Updates tooling for this purpose and also the prose.
2016-10-12 01:44:49 -07:00
Ward Bell 61b13c13ec chore: v.2.0.2 + standard MIT licenses property (#2559) 2016-10-06 17:21:05 -07:00
Ward Bell ec1c8281e2 docs(change-log): add documentation change log 2016-10-06 13:21:31 -07:00