ef1eb67ceb
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:30 +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
606c656f1b
fix : #95
2016-10-17 15:22:23 +01:00
abdb946d3b
fix : #96
2016-10-17 15:15:00 +01:00
883a29ecf7
Fix minor typo in HTTP guide ( #2604 )
2016-10-14 12:35:28 +02:00
e503efe8c8
docs(toh5): add moduleId information ( #2597 )
2016-10-13 16:41:57 -07:00
94b8793d70
docs(template-syntax): correct ref var scope per #2458 ( #2602 )
...
closes #2458
2016-10-13 16:26:41 -07:00
4f81a7ee8c
docs(toh5): update styles.css link ( #2601 )
2016-10-14 01:12:06 +02:00
f49633a62c
docs(attribute directives): copy edits squashed ( #2508 )
2016-10-13 15:42:23 -07:00
0f9a00f144
docs(changelog): fix title in v.2.1.0 announcement ( #2591 )
2016-10-12 15:32:12 -07:00
7b509de819
docs(changelog): in-sync with Ng v.2.1.0 ( #2590 )
2016-10-12 15:29:28 -07:00
a63c75cc18
chore: release 2.1.0 ( #2589 )
2016-10-12 23:41:42 +02: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
2e17d587de
docs(toh-5): add AppRoutingModule ( #2584 )
2016-10-11 16:30:30 -07:00
492c01d0dd
docs(quickstart): fix link to styles.css ( #2575 )
2016-10-11 16:26:33 +02:00
72b0ec623e
lazy-loading统一翻译为惰性加载
2016-10-11 16:26:41 +08:00
557029074f
修正了遗漏的翻译
2016-10-11 16:26:41 +08:00
2751b20aae
修正 教程 7.Http 翻译问题
2016-10-10 06:53:40 +08:00
3eedcff860
chore: link the TS docs home page banner to the docs change-log ( #2567 )
2016-10-07 15:32:10 -07:00
6ca91f710d
api(cleanup): Remove preview from the API reference banner
2016-10-07 14:32:48 -07:00
61b13c13ec
chore: v.2.0.2 + standard MIT licenses property ( #2559 )
2016-10-06 17:21:05 -07:00
ec1c8281e2
docs(change-log): add documentation change log
2016-10-06 13:21:31 -07:00
b6e5dc9eec
docs(version): fix the version number on the docs homepage
2016-10-06 12:42:33 -07: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
eff7e04ac3
Router typos ( #2523 )
...
* Fixed typo which was referring to 'imports' section and not 'setup' section
* Fixed 1 char typo: /he *Cancel/the *Cancel/
* Fixed broken link: router.html#optional-route-parameter (added an 's' to 'parameter')
* corrected grammar: /affords/afford/
* Fixed typo: /moved them/move them/
2016-10-05 16:15:42 -07: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
3a78f6d8c6
chore(docs): list minimum node as 4 ( #2547 )
2016-10-05 22:58:57 +01:00
020722e3ea
translate: 3450
2016-10-05 21:44:04 +01:00
08ef04a968
fix: override
2016-10-05 20:54:19 +01:00
7350ac0e1f
fix : #87
2016-10-04 11:09:40 +01:00
865383612d
fix : #87
2016-10-04 11:08:53 +01:00
bf97a9a2e1
docs(style-guide): fix folder structure in 04 to match what we do. ( #2535 )
...
closes issue #2533
2016-10-03 18:16:15 -07:00
661c971778
fix(i18n): fix link and formatting error ( #2528 )
2016-10-03 11:33:17 -07:00
b6ff278ac5
fix : #86
2016-10-03 10:26:22 +01:00
ad01e61fb3
translate: testing.jade to line 3266
2016-10-02 22:13:04 +01:00
032ac9c337
typo
2016-10-02 16:43:49 +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
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
7796f485fd
fix(guide/form): fix a broken link ( #2498 )
2016-09-30 23:33:26 +02:00
c548f9700b
docs(style-guide): add missing word in bootstrapping remark ( #2512 )
2016-09-30 23:30:20 +02:00
98d438ed9b
docs(testing): delete extra 'with' ( #2513 )
...
Deleted extra 'with'
2016-09-30 23:29:49 +02:00
1591bcc0e1
docs(testing): fix link ( #2514 )
...
Fixed link
2016-09-30 23:29:16 +02:00
4f9f51cb4b
Fixed minor typos in testing ( #2515 )
...
Fixed minor typos in testing
2016-09-30 23:28:45 +02:00
54d1be2e5a
把angular2-in-memory-web-api改名为angular-in-memory-web-api
...
#84
2016-09-30 21:38:44 +08:00
rexebin
Sebastián Ramírez
Jesús Rodríguez
Ward Bell
Kapunahele Wong
Torgeir Helgevold
Zhicheng Wang
SangKa
Naomi Black
Matthew Hegarty
Brandon
Filipe Silva
Alireza Mirian
Jonas Felix
Chase