Commit Graph

46 Commits

Author SHA1 Message Date
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 ac0e82cda7 docs(js/guide): don't use shredder & _data.json fixes (#2467)
replay Patrice's PR #2448
2016-09-24 14:30:06 -07: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 7d45d60c91 docs(overview): update to new organization (#2405) 2016-09-19 21:23:02 -07:00
Jesús Rodríguez 693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
Zhicheng Wang ab06793705 对上次的合并查漏补缺 2016-09-10 18:31:38 +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
Jesús Rodríguez 5b64b94540 docs(overview): fix live-example link (#2192) 2016-08-26 10:11:15 -07:00
Zhicheng Wang 251d4ffe6c 合并了官方的最新更新 2016-08-06 20:04:41 +08: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 dba8c9ec99 内容微调 2016-06-19 20:18:03 +08:00
Zhicheng Wang 7202fa6cb4 bugfix: 自动加空格时没有忽略html标签,导致界面混乱 2016-06-19 19:31:02 +08:00
Zhicheng Wang d46b4911e6 根据Hantsy的意见,把所有“API参考”改为“API参考手册”
为非对照模式的中文添加translated-cn类,以便自动加空格
2016-06-19 17:04:46 +08:00
Zhimin(Rex) YE 70f534cc2a removed js/dart languages from dropdown list.
review for displaying-data.jade and index.jade.
2016-05-26 22:52:50 +01:00
Zhicheng Wang c9ff72d31a 把“开发人员指南”批量改名为“开发指南”,前者读起来太啰嗦 2016-05-26 19:20:43 +08:00
Zhicheng Wang 940d0d9c22 开发指南-生命周期钩子 翻译完毕 2016-05-26 19:02:38 +08:00
Zhimin YE (Rex) e1a273a986 small adjustment to architcture and index 2016-05-25 14:21:02 +01:00
Zhicheng Wang bfc7c818cb 开发指南-HTTP客户端 翻译了一半儿 2016-05-24 21:27:24 +08:00
Zhicheng Wang 335ac9d0a3 全部“烹饪书”改名为“烹饪宝典” 2016-05-22 19:26:23 +08:00
Zhicheng Wang aadbeb3ae9 修正一些合并中的问题 2016-05-19 19:23:01 +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
Kathy Walrath a595eb81ef docs(dart): update BASICS intro (#1410)
Also copy edited the TS version a bit.
2016-05-18 13:43:02 -07:00
Zhicheng Wang 86d151c40e 把QuickStart改成“快速起步” 2016-05-18 13:30:07 +08:00
Zhicheng Wang 2368b8f4c3 文字微调
食谱批量替换为菜谱
2016-05-17 15:46:28 +08:00
Zhicheng Wang 67c9ef0c7a 基础知识-架构 翻译了一部分。修改了对照翻译模块的小功能。 2016-05-14 16:20:01 +08:00
Zhicheng Wang 274bfc1202 把“Cookbook”翻译成中文。
基础知识首页一审完毕。
2016-05-13 18:15:42 +08:00
Zhicheng Wang f397bf6608 把“Live Example 鲜活范例”统一译成“在线例子” 2016-05-11 14:47:32 +08:00
Zhicheng Wang 99d89072d5 把所有误用的他改成它 2016-05-09 21:50:33 +08:00
Zhicheng Wang d21325fa55 完成了指南首页
处理了排列不规范的列表翻译,以便将来可以统一实现对照翻译
2016-04-20 20:07:39 +08:00
Zhicheng Wang da8bf0efb9 Guide首页完成了大部分 2016-04-20 00:18:04 +08:00
jbnizet ea9216ce8a docs: fix typo
closes #916
change `throught` to `through` in TS tutorial
2016-03-08 15:17:16 -08:00
Josh Otis 746a6649b2 chore: new flat left navigation panel (all language tracks) 2016-03-03 04:51:52 -08:00
Ward Bell 95c34d27bc docs: temporary TS-referencing chapters for gaps in JS/Dart
Also displays styleguide at language level
Fragmented glossary for JS & Dart
2016-03-01 11:22:04 -08:00
Ward Bell 8183ad6f54 docs(intro): heavily revised based on Jeremy W feedback
Closes 717. See also #703
2016-01-18 00:40:07 -08:00
Naomi Black cbde64d712 chore(graphics): updates to guide images people and airplane 2015-12-21 06:30:36 -08:00
Naomi Black 2c7bcdd832 chore(images): remove images we haven't updated yet 2015-12-15 01:15:53 -08:00
Ward Bell 393987bdf5 docs: split intro into separate chapters, shuffle code, update to alph52
closes #483
A major refactoring of the intro chapters includes text revision
and the addition of "module" as an 8th "basic building block".
Incorporates John Papa feedback.
2015-12-12 09:46:07 -08:00
denismosolov b7897eef85 docs(developer-guides): incorrect QuickStart link in How to Read this Guide section
closes #446

quickstart -> quickstart.html prevent 404 page
2015-12-06 10:59:09 -08:00
Ward Bell e00b024e95 docs(intro): update databinding image as Felipe suggests
closes #428
2015-12-01 01:44:34 -08:00
Ward Bell 83fab41666 (docs) fix plunker for Intro; minor Forms tweaks
closes #426
2015-11-30 21:24:19 -08:00
Ward Bell c8be003781 (docs) devguide intro - fix typos and infelicities
closes #420
2015-11-30 14:55:54 -08:00
Ward Bell e6e8cca9ef (docs) DevGuide Introduction
incorporates Pascal & Felipe suggestions
includes running sample code for the architecture overview
closes #417
2015-11-30 12:54:16 -08:00
Robert Messerle f38e6e7bd4 cleans up various alignment and layout issues 2015-10-09 16:27:33 -07:00
Jay Traband 50e758ba60 improved infrastructure for devguide and revised getting started (TS) 2015-09-10 13:32:57 -07:00