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
7f022c153b
fix aot-compiler, router and upgrade
2016-11-22 15:21:36 +00:00
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +08:00
93f08c3723
minor fixes for dynamic forms,
...
form-validation
upgrade
2016-11-04 12:41:10 +00:00
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
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
0741e1f058
fix: upgrade example
2016-10-18 15:00:32 +01:00
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
78418f4d3c
调整additional的翻译
2016-10-06 19:38:32 +08:00
dca47cbb1a
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/_examples/quickstart/ts/package.1.json
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/upgrade.jade
2016-10-02 10:39:25 +08:00
56ac24b411
chore: fix broken links on 9/30, mostly API links ( #2520 )
2016-10-01 07:11:21 -07:00
66c630df99
docs(upgrade): update to latest release + tweaks ( #2460 )
2016-09-27 01:22:38 -07:00
f7c60a07df
fix： change all 他 > 它
2016-09-25 19:50:45 +01:00
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
fdf517ee6b
docs(upgrade): temporary fix broken regions ( #2424 )
2016-09-21 14:53:43 +02:00
b74b446b2c
fix: upgrade 1 example error.
2016-09-19 17:06:50 +01:00
6f6f89ed9c
把所有“内建”改为“内置”
2016-09-17 11:46:17 +08:00
50f73986be
翻译完了NgModule FAQ
...
少量错别字修改
2016-09-17 11:45:56 +08:00
2a1c3626c5
去掉了大部分儿化音
...
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
873eea9e7e
review: component-communication, testing, upgrade: fixes.
2016-08-16 14:29:37 +01:00
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
d79adb2422
docs(rc5): update docs and plunkers for rc5
2016-08-09 11:48:07 -07:00
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
0ae32e7adb
docs(upgrade): cover Angular 1.5 one-way data bindings
...
closes #1090 , 1169
2016-07-25 09:58:41 -07:00
6264d3bcde
批量把Provider/provide改译为提供商/提供，以和ISP（互联网服务提供商）的译法看齐
2016-07-07 08:22:36 +08:00
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
b21c90c358
fix(doc): fix 404 problem of some api url
2016-06-28 22:25:24 -07:00
bc2e4b83c0
把所有全角括号改成了半角的
2016-06-14 09:26:54 +08:00
164244d77a
修正了api的链接（仅中文版）
2016-06-10 14:45:12 +08:00
cc96a317a0
review of upgrade.jade is done.
2016-06-08 16:38:38 +01:00
b0e86f664f
upgrade.jade review: to line 1622.
2016-06-07 22:22:48 +01:00
90a2f1aefa
upgrade.jade to line 461
2016-06-07 17:10:02 +01:00
24761d76b8
文字微调
2016-06-07 09:46:26 +08:00
633964ac2f
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/upgrade.jade
2016-06-04 17:52:51 +01:00
1d294a831c
docs(upgrade): escape script tags
...
closes #1584
2016-06-04 01:17:27 -07:00
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
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
20bf6c0085
翻译完了“升级”一章的新增部分
...
合并了测试索引
解决了移动设备上菜单显示不全的问题
文字微调
2016-05-31 12:35:37 +08:00
3c666d881e
修改了输入法笔误
...
解决了移动设备上菜单显示不全的问题
2016-05-31 07:30:15 +08:00
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
f5e25c2371
开发指南-测试 初译完毕
2016-05-30 19:23:17 +08:00
348a673cb0
开发指南-从1.x升级 初译完毕
2016-05-29 17:20:36 +08:00
ce2b8127cb
开发指南-从1.x升级 翻译了2/3左右
...
把所有“操作函数”统一改名为“操作符”，在此语境下不会被混淆
2016-05-29 14:23:53 +08:00
4acbef19a8
docs(upgrade): add ngUpgrade guide version 2
...
closes #1538
This is a major reorganization of the Upgrade guide.
* Compatible with the new version of the AngularJS 1 PhoneCat
tutorial.
* No longer switching Angular 1 code to SystemJS for PhoneCat,
to allow beginning Angular 2 migration with fewer preparation
steps. SystemJS switch now happens simultaneously with upgrade.
(This is based on input from @joeeames)
* Testing moved to an appendix to make the main narrative
shorter and easier to follow.
* Use component methods to do phone filtering and ordering
instead of introducing pipes to replace filterFilter and orderByFilter.
* Cover issue with camelCase inputs on downgraded components.
For authors:
* All examples now fully integrated with the example boilerplate. Uses the
same Angular 2 version as all other guides. E2E tests are executed
along with all the others.
* Reduced number of PhoneCat versions from five to three.
* Each directory has a README explaining how to run it and what might
be peculiar about it.
Closes angular/angular#8622
Relates to angular/angular.js#14416
Relates to angular/angular-phonecat#326
2016-05-28 09:33:06 -07:00
0522f7671d
开发指南-从1.x升级 翻译了1/3左右
2016-05-28 20:54:33 +08:00
e9c7c92483
开发指南-从1.x升级 开始翻译
2016-05-28 15:52:26 +08:00
60eeb0123a
docs(typings): update typings chapter + update lingering old package references
2016-05-21 16:26:54 -07:00
3d5302adce
chore: update to rc.0
2016-05-02 19:57:28 -07:00
4097c67b59
chore: rename Elvis to safe navigation operator
...
closes #1139
2016-04-23 14:22:57 -07:00
c9b66ea04d
docs(upgrade): Small typo fix
...
Small typo fix
2016-04-20 13:15:50 -07:00
rexebin
Yang Lin
Zhimin YE
Filipe Silva
Zhicheng Wang
Ward Bell
Jesús Rodríguez
Peter Bacon Darwin
Tero Parviainen
priestch
Aristeidis Bampakos