27 Commits

Author SHA1 Message Date
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
Zhimin YE
93f08c3723 minor fixes for dynamic forms,
form-validation
upgrade
2016-11-04 12:41:10 +00:00
Zhicheng Wang
e1fd53b9b3 更正individual的翻译 2016-10-06 20:48:24 +08:00
Zhicheng Wang
e693d35fb1 合并了最新更新,翻译了官方的发布声明 2016-09-15 17:08:17 +08: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
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
9f2c4270e1 调整了导航菜单,直接显示新版 2016-06-23 09:22:50 +08:00
Zhicheng Wang
bb9adc3eba Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade
2016-06-23 08:48:57 +08:00
Torgeir Helgevold
3cb219c5ab docs(dynamic-cookbook): upgrade to use new forms api
convert exiting to use deprecated name

converted to new api

text

warnings

fix plunker

text

test weak

text

space

text

lint

order

tweak
2016-06-20 21:02:28 -04:00
Rex
3659248ee5 continue review of "我们" keyword. 2016-06-20 12:29:43 +01:00
Zhicheng Wang
e338333e2f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
2016-06-13 16:39:34 +08:00
Foxandxss
074a33a622 chore: tslint sweep done 2016-06-13 02:40:28 +02:00
Zhicheng Wang
335ac9d0a3 全部“烹饪书”改名为“烹饪宝典” 2016-05-22 19:26:23 +08:00
Zhicheng Wang
8f01383b6c 烹饪书-依赖注入 二审完毕
烹饪书-动态表单 二审完毕
烹饪书-设置文档标题 二审完毕
2016-05-18 11:38:10 +08:00
Zhicheng Wang
f50b34ad4f 烹饪书-依赖注入 二审中 2016-05-17 20:36:35 +08:00
Zhicheng Wang
2368b8f4c3 文字微调
食谱批量替换为菜谱
2016-05-17 15:46:28 +08:00
Zhimin(Rex) YE
c1b0bcdae4 review of dynamic-form.jade 2016-05-14 14:06:23 +01:00
Zhicheng Wang
f0e75413c8 请看改成参见,更书面化。
修订了一些词汇。
2016-05-09 22:16:34 +08:00
Zhicheng Wang
99d89072d5 把所有误用的他改成它 2016-05-09 21:50:33 +08: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
7f6a9be1ee a bit more work on component-communication.jade. 2016-04-18 17:02:14 +01:00
Rex
50f8e27b15 Dynamic-form draft translation. 2016-04-15 14:13:18 +01:00
Nursultan Turdaliev
da310e3f81 docs(dynamic-form): "ngMode" => "ngModel"
closes #989
2016-03-19 11:24:02 -07:00
Torgeir Helgevold
c1ea652bc9 docs(cb-dynamic-form): Fix a few minor grammar errors in dynamic form cookbook
closes #981
2016-03-17 20:51:40 -07:00
Torgeir Helgevold
db7fba867c docs(cb-dynamic-form): new cookbook on dyn form gen with NgFormModel 2016-03-16 04:14:31 -07:00