37 Commits

Author	SHA1	Message	Date
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
yinyong02	3575677f5a	Fixed typo	2016-10-24 09:35:09 +08:00
Filipe Silva	0d49fecd30	chore: update to @types (#1872) ... * chore: update examples to @types * fix toh-6 aot and add types link	2016-10-20 17:01:16 -07:00
Zhicheng Wang	78418f4d3c	调整additional的翻译	2016-10-06 19:38:32 +08:00
Zhicheng Wang	54d1be2e5a	把angular2-in-memory-web-api改名为angular-in-memory-web-api ... #84	2016-09-30 21:38:44 +08: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
Ward Bell	6e17d33475	chore: update samples to "angular-in-memory-web-api" (#2472) ... chore: update samples to "angular-in-memory-web-api"	2016-09-25 15:24:13 -07: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
Zhicheng Wang	e693d35fb1	合并了最新更新，翻译了官方的发布声明	2016-09-15 17:08:17 +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
Kapunahele Wong	2ec07472ea	Guide & Features edits (#2180) ... * Guide & Features edits * PR updates & Architecture edits * a couple we -> you updates * architecture edits * copy edits in arch., index, npm-packages * few copy edits * some chapter -> page changes	2016-08-29 08:37:39 -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
Kyle Roberts	335d20e834	docs(Npm Packages): grammar and capitalization consistency ... closes #1947	2016-07-25 10:12:18 -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
Foxandxss	37b377ddb3	docs: update node and npm version recommendations ... closes #1821	2016-07-05 23:09:37 -07:00
Zhicheng Wang	bc2e4b83c0	把所有全角括号改成了半角的	2016-06-14 09:26:54 +08:00
Zhimin(Rex) YE	c16f003d51	review of npm-package.jade is done.	2016-06-05 22:48:50 +01: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
Ward Bell	2f115a3425	chore: fix broken devguide links as of May 31 ... Did not fix broken Dart and API links	2016-06-01 00:52:22 -07:00
Zhicheng Wang	752a152731	Merge remote-tracking branch 'origin/master' ... upgrade.jade的附录没有翻译 # Conflicts: # public/docs/ts/latest/guide/_data.json # public/docs/ts/latest/guide/npm-packages.jade # public/docs/ts/latest/guide/upgrade.jade # public/docs/ts/latest/quickstart.jade # public/index.jade	2016-05-30 21:46:16 +08:00
Foxandxss	888dcf362a	chore: remove note against node 6 ... closes #1540	2016-05-29 12:46:55 -07:00
Zhimin(Rex) YE	76aed6e600	minor fix on npm-package.jade ... uncomment mixin for js docs.	2016-05-27 00:51:01 +01:00
Zhicheng Wang	7e2d7a2a9e	开发指南-npm包 初译完毕	2016-05-26 20:50:46 +08:00
Foxandxss	81ebdfb8ef	docs: add strong advice on node and npm versions	2016-05-21 15:56:09 -07:00
Foxandxss	bd52aa3f34	docs: complete es6-shim to core-js migration ... closes #1442	2016-05-19 19:12:14 -07:00
Aristeidis Bampakos	cc450ad6e8	docs(npm-packages): Fixed several typos	2016-05-11 20:07:40 -07:00
Michel D'HOOGE	44f63f9907	docs(npm-packages): typo ES6 = ES2015 ... closes #1263	2016-05-03 16:02:16 -06:00
Ward Bell	3d5302adce	chore: update to rc.0	2016-05-02 19:57:28 -07:00
Josh Otis	746a6649b2	chore: new flat left navigation panel (all language tracks)	2016-03-03 04:51:52 -08:00
Ward Bell	f01dc81fa1	docs(npm packages): added chapter per angular issue #6659	2016-03-01 13:00:34 -08:00