625ce82a6c
Fix all _data.json
2016-12-01 10:54:43 +08:00
93c5264841
[trans] ts-to-js.jade
2016-11-29 03:17:28 +08:00
9a9fef17eb
fix: component-communication
2016-11-27 18:20:39 +00:00
5617821cf9
fix: aot-compiler and toh-pt6
2016-11-27 18:14:44 +00:00
afc17dce11
快速开始 -> 快速起步
2016-11-27 10:41:55 +00:00
26100f95f6
搭建 -> 搭建本地开发环境
2016-11-27 10:38:15 +00:00
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
eb6eae8390
patch visual-studio
2016-11-04 14:05:32 +00:00
89d33384ff
sync visual-studio cookbook
2016-11-04 13:27:00 +00: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
43c9071a2e
docs(cookbook): fix spelling error for word 'class' ( #2682 )
2016-10-31 00:48:22 -07:00
7d142c1d78
docs(vs2015): update for current tools. ( #2672 )
...
closes #2672
2016-10-26 09:26:40 -07: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
7808603489
translate: i18n done.
2016-10-20 10:59:05 +01:00
3eb7a41602
docs(aot-cb):bundle in-mem-web-api with esm and umd ( #2617 )
...
s
s
2016-10-19 21:52:32 -07:00
9bf733b940
translate: i18n - line 247
2016-10-19 21:43:49 +01:00
9129f46f45
translate: form-validation, done.
2016-10-19 20:52:28 +01:00
13a3074d6c
translate: form-validation to line 486
2016-10-19 17:01:51 +01:00
1a7773e9d6
translate: form-validation: line 89
2016-10-18 22:40:53 +01:00
b82cf0de4c
fix: ngmodule-faq
2016-10-18 22:16:04 +01:00
9d9b00b3b9
patch： ts-to-js, component-communication, set-document-title and visual-studio.
2016-10-18 19:53:12 +01:00
7a894d6434
patch up: ngmodule-faq
2016-10-18 19:44:54 +01:00
8202c332c2
fix: aot-compiler
2016-10-18 19:24:18 +01:00
ea61886279
fix: a1-a2-quick-ref
2016-10-18 17:01:27 +01:00
45b9e57b52
fix: aot-compiler
2016-10-18 16:54:21 +01:00
3508b7988d
docs(cb-aot): fix typo in tab names. ( #2621 )
2016-10-18 15:11:24 +02: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
abdb946d3b
fix : #96
2016-10-17 15:15:00 +01:00
cdfe957ab8
docs(toh-6-aot): add aot to toh-6 ( #2496 )
...
* docs(toh-6-aot): add aot to toh-6
s
s
s
s
s
* docs(toh-6-aot): add aot to toh-6
* docs(toh-6-aot): make aot e2e tests run in the same project
Updates tooling for this purpose and also the prose.
2016-10-12 01:44:49 -07:00
7aa3c2320a
把立即加载统一改为主动加载
2016-10-12 15:23:34 +08:00
72b0ec623e
lazy-loading统一翻译为惰性加载
2016-10-11 16:26:41 +08:00
e1fd53b9b3
更正individual的翻译
2016-10-06 20:48:24 +08:00
41b0cc800b
更正了technically的翻译
2016-10-06 20:37:42 +08:00
78418f4d3c
调整additional的翻译
2016-10-06 19:38:32 +08:00
ff118810ff
docs(router): Updated routing examples to use routing modules ( #2478 )
...
Simplified routing in tutorial example
Updated ngmodule guide and ngmodule faq with routing module prose
2016-10-05 14:59:09 -07:00
661c971778
fix(i18n): fix link and formatting error ( #2528 )
2016-10-03 11:33:17 -07: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
9b083966f3
chore(i18n): fix broken plunker link ( #2519 )
2016-09-30 23:05:50 -07:00
ba6b681ed4
docs(i18n): incorporate corrections and feedback from Victor Berchet ( #2517 )
...
See PR #2491
2016-09-30 19:14:41 -07:00
66e3eca8eb
docs(rc4-to-rc5): change cleanup
...
closes #2516
2016-09-30 17:14:55 -07:00
e6199a8dfb
docs(i18n): add internationalization (i18n) guide ( #2491 )
...
* docs(i18n): add internationalization (i18n) guide
* docs(cb-i18n): revamped to System.import the translation file
2016-09-29 11:15:55 -07:00
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
6def9505cc
chore: convert templateUrls to use moduleId where possible. ( #2477 )
2016-09-25 18:51:54 -07:00
f7c60a07df
fix： change all 他 > 它
2016-09-25 19:50:45 +01:00
a59b1b60ee
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/testing.jade
2016-09-23 23:22:42 +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
b478aaf7a2
docs(testing): from Igor Minar feedback (Part 1) ( #2450 )
2016-09-23 02:03:20 -07:00
Yang Lin
rexebin
Zhimin YE
WilliamKoza
Deborah Kurata
Filipe Silva
Torgeir Helgevold
Aristeidis Bampakos
Zhicheng Wang
Brandon
Ward Bell
Jesús Rodríguez