Commit Graph

39 Commits

Author SHA1 Message Date
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
WilliamKoza 43c9071a2e docs(cookbook): fix spelling error for word 'class' (#2682) 2016-10-31 00:48:22 -07:00
rexebin 9d9b00b3b9 patch: ts-to-js, component-communication, set-document-title and visual-studio. 2016-10-18 19:53:12 +01: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
Patrice Chalin 59f6ebe849 docs(*): misc fixes to prose in support of jade2ng (#2266)
Fixes to prose “syntax”. Anomalies detected by jade2ng.
Also updated the main _utils-fn.jade in support of jade2ng as well.
2016-09-06 10:28:24 -07:00
Zhimin YE (Rex) 873eea9e7e review: component-communication, testing, upgrade: fixes. 2016-08-16 14:29:37 +01:00
Zhicheng Wang d034bc33c8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/contribute.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/_data.json
#	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/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-06 19:52:08 +08:00
Brandon Roberts b93fb12fea chore(examples): Updated live example links to use helper directive
closes #2005
2016-08-05 16:41:45 -07:00
Zhicheng Wang 28fe7d848f 把“作用范围”批量改为“作用域” 2016-07-24 17:31:51 +08:00
Rex 77cdd8bde8 review all "我们" keyword, making the translations more natural. 2016-06-20 10:59:00 +01:00
Zhicheng Wang bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhicheng Wang 8e571257cd 更新了“关于中文版”中的翻译状态 2016-06-06 09:52:45 +08:00
Zhimin YE (Rex) dd4e887b47 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-06-02 08:58:19 +01:00
Ward Bell 41947cbd1f chore: fix gulp serve-and-sync tasks and many broken example links
The serve-and-sync tasks wait for `_copy-example-boilerplate` to finish
Differentiates app compile, spec compile, and test failures
StyleGuide (for documentators) up-to-date
2016-06-01 16:17:06 -07:00
Zhicheng Wang 335ac9d0a3 全部“烹饪书”改名为“烹饪宝典” 2016-05-22 19:26:23 +08:00
Zhicheng Wang 5f1f27e09c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.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/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/news.jade
#	public/resources/index.jade
2016-05-19 13:33:02 +08:00
Zhicheng Wang f50b34ad4f 烹饪书-依赖注入 二审中 2016-05-17 20:36:35 +08:00
Zhicheng Wang e139c6b561 烹饪书-组件通讯 二审完毕 2016-05-17 19:29:33 +08:00
Zhicheng Wang 2368b8f4c3 文字微调
食谱批量替换为菜谱
2016-05-17 15:46:28 +08:00
Zhicheng Wang fd69ea3270 把部分expose统一译为暴露 2016-05-16 23:15:02 +08:00
dreambo8563 eec5c00fc0 docs(component-communication): remove _ from private _timerComponent 2016-05-15 15:26:04 -07:00
Zhimin(Rex) YE ff0f4291cc review of component-communication.jade 2016-05-14 11:46:26 +01:00
Zhicheng Wang bca76787bb 部分监听改为监视 —— 监听只适用于listen的翻译 2016-05-11 19:30:44 +08:00
Zhicheng Wang f0e75413c8 请看改成参见,更书面化。
修订了一些词汇。
2016-05-09 22:16:34 +08:00
Zhicheng Wang 99d89072d5 把所有误用的他改成它 2016-05-09 21:50:33 +08:00
Zhicheng Wang 583247f0f9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	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/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/features.jade
#	public/index.jade
2016-05-03 22:33:20 +08:00
Filipe Silva ebc022e475 docs: update prose for the `let` change to ngFor 2016-04-28 18:37:45 -07:00
Rex bce52dc696 testing.jade - done.
Jasmine-testing-101.jade: started.

Minor corrections in component-communication.jade and dynamic-form.jade.
2016-04-19 16:07:22 +01:00
Rex cb09d97c96 component-communication translation is done.
change translation of `mothod` to `class method`
2016-04-19 12:06:15 +01:00
Rex 7f6a9be1ee a bit more work on component-communication.jade. 2016-04-18 17:02:14 +01:00
Zhimin(Rex) YE 0127ed177d component-communication 2016-04-17 21:54:07 +01:00
Zhimin(Rex) YE 60d4b32064 just started component-communication. 2016-04-17 21:52:03 +01:00
Aristeidis Bampakos 36c98ae4bf docs(cookbook/component-communication): Astronout -> AstronautComponent word typo fix
closes #1067
Changed AstronoutComponent to AstronautComponent.
2016-04-11 12:45:26 -07:00
Naomi Black 0e8d7afc08 chore(links): fix broken links in dev guides 2016-03-16 20:05:16 -07:00
Ward Bell 1a154daa2e chore: add gulp link-checker task
also fix some of the broken links that it found
2016-03-10 23:53:43 -08:00
Ward Bell 513e919be5 docs(comp comm cookbook): add #localvar alternative for parent calling child
also fixes glossary decorator-flag bug
2016-03-07 14:12:48 -08:00
Josh Otis 746a6649b2 chore: new flat left navigation panel (all language tracks) 2016-03-03 04:51:52 -08:00
Ward Bell 2f82a51e0f chore: rename cookbooks -> cookbook 2016-02-22 02:08:47 -08:00