135 Commits

Author	SHA1	Message	Date
Yang Lin	416959ead6	Fixes issue 127	2016-12-06 12:01:38 +08:00
Rex YE	a005f250b0	fix: #146	2016-11-28 13:52:45 +00:00
Rex YE	f6f570dfc0	fix: #144	2016-11-28 13:49:28 +00:00
Rex YE	2b5da24d94	fix： #145	2016-11-28 13:47:14 +00:00
rexebin	a685691348	Merge remote-tracking branch 'todoubaba/template-syntax' ... # Conflicts: # public/docs/ts/latest/guide/template-syntax.jade	2016-11-27 20:27:16 +00:00
Yang Lin	f04801fe03	template-syntax.jade	2016-11-28 02:09:25 +08:00
rexebin	733d702874	fix: template-syntax.jade form	2016-11-27 17:56:17 +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
Rex YE	a13b40442e	fix compile errors.	2016-11-22 14:26:51 +00:00
Yang Lin	5a7745fb27	Upgrade to 2.2.0	2016-11-22 20:07:16 +08:00
rexebin	47d646a080	补齐: template-syntax.jade	2016-11-03 20:40:39 +00:00
Zhimin YE	f34e73eb8d	Patch: template-syntax's new contents.	2016-11-03 18:12:44 +00:00
Zhimin YE	b1aae7f306	fix template-syntax comments	2016-11-03 16:54:53 +00:00
Zhimin YE	23984f8caf	fix few compiling errors(live examples)	2016-11-03 15:52:05 +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
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	9cdc23c0f7	fix: forms, style guide and template syntax	2016-10-18 10:47:45 +01: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
Ward Bell	94b8793d70	docs(template-syntax): correct ref var scope per #2458 (#2602) ... closes #2458	2016-10-13 16:26:41 -07:00
Zhicheng Wang	41b0cc800b	更正了technically的翻译	2016-10-06 20:37:42 +08:00
Zhicheng Wang	78418f4d3c	调整additional的翻译	2016-10-06 19:38:32 +08:00
Ward Bell	56ac24b411	chore: fix broken links on 9/30, mostly API links (#2520)	2016-10-01 07:11:21 -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	6f6f89ed9c	把所有“内建”改为“内置”	2016-09-17 11:46:17 +08:00
Zhicheng Wang	2a1c3626c5	去掉了大部分儿化音 ... 感谢来自github的iloveyo123u1和Elderry	2016-09-12 08:35:02 +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
Kathy Walrath	3fa68cd7ac	docs(template-syntax): delete a single character	2016-09-06 10:33:13 -07:00
Peter Fryer-Davis	32ac619fc7	Uwaterloo 210J pfryerda edits (#1968) ... * template-syntax - removed word redundancies, consistent bolding rather than italics * Some (not all) changes from PR. * remaining changes from pull request	2016-09-06 10:31:25 -07: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)	654030f09d	Merge remote-tracking branch 'remotes/angular.io/master' ... # Conflicts: # public/docs/ts/latest/cookbook/dependency-injection.jade # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/hierarchical-dependency-injection.jade # public/docs/ts/latest/guide/lifecycle-hooks.jade # public/docs/ts/latest/guide/server-communication.jade # public/docs/ts/latest/guide/template-syntax.jade # public/docs/ts/latest/guide/user-input.jade # public/docs/ts/latest/guide/webpack.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/toh-pt2.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-08-23 14:02:54 +01:00
Zhimin YE (Rex)	46f3e0c7a7	fix: #56	2016-08-18 11:32:06 +01:00
Ward Bell	207b04e264	docs(template-syntax): tweak [(ngModel)] section header	2016-08-17 16:42:56 -07:00
Patrice Chalin	6df26b5058	docs(template-syntax): update cache copy from latest + post-RC5 Dart resync ... closes #2121 Contributes to #2077.	2016-08-17 16:10:52 -07: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	4400deeef8	Merge remote-tracking branch 'origin/master' ... # Conflicts: # gulpfile.js # public/docs/ts/latest/guide/router.jade # public/docs/ts/latest/guide/template-syntax.jade # public/docs/ts/latest/tutorial/toh-pt6.jade # public/resources/js/controllers/resources-controller.js	2016-07-24 17:27:48 +08:00
Kathy Walrath	66984d5fc8	Revert "Template Expression Operators Copy Edit " ... This reverts commit d0811714d54cda1882f8287e095bf182ce39421d.	2016-07-21 13:41:44 -07:00
sgmills365	14bd476d89	Added capital lettings to titles	2016-07-21 00:42:18 -07:00
amandaegraham	d0811714d5	Template Expression Operators Copy Edit ... Waterloo ENGL 210 J Student Changed order of text in pipe operator to introduce pipe operator Changed word choice/word location in pope operator Added : before examples to keep consistent	2016-07-21 00:42:18 -07:00
amandaegraham	7e1dba64eb	Interpolation Copy Edit	2016-07-21 00:42:18 -07:00
amandaegraham	e8642d4616	HTML Section Copy Edit ... Waterloo ENGL 210J Student Line 44: Changed tense Line 54: Changed wording of second sentence to not start with 'and'. Added DOM meaning (Document Object Model)	2016-07-21 00:42:18 -07:00
dreamapple	2269c9f893	翻译的建议	2016-07-18 10:50:36 +08:00
dreamapple	e72ae07927	翻译的建议	2016-07-18 10:46:20 +08:00
dreamapple	a56b460e20	翻译的建议: "In practice"在文中翻译为"实际上"可能比"在实践中"要好理解.	2016-07-18 10:38:00 +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	0dd2932a2e	Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/_data.json # public/docs/ts/latest/_data.json # public/docs/ts/latest/guide/router.jade # public/docs/ts/latest/guide/security.jade # public/docs/ts/latest/guide/template-syntax.jade # public/news.jade # public/resources/_data.json # public/resources/index.ejs # public/resources/js/controllers/resources-controller.js	2016-07-01 08:38:54 +08: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