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
94b8793d70
docs(template-syntax): correct ref var scope per #2458 ( #2602 )
...
closes #2458
2016-10-13 16:26:41 -07: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
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
557029074f
修正了遗漏的翻译
2016-10-11 16:26:41 +08: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
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
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
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
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
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
480a824214
docs(style-guide): Fix a couple typos
...
closes #2489
2016-09-27 12:03:42 -07:00
ba5e194acd
Update router.jade
...
改正错误
2016-09-27 16:25:02 +08:00
66c630df99
docs(upgrade): update to latest release + tweaks ( #2460 )
2016-09-27 01:22:38 -07:00
e82f28b844
fix(guide/form): fix a typo ( #2483 )
2016-09-27 00:59:45 -07:00
2b7fb86890
docs(style-guide): remove rc relics and update for ngmodules ( #2463 )
2016-09-27 00:58:10 -07:00
e87772f5d5
改正错误
...
#82
2016-09-27 10:15:33 +08:00
843351d8b7
改正错误
...
#82
2016-09-27 10:08:35 +08:00
62d16a8968
docs(architecture): remove reference to directives in component metadata ( #2481 )
2016-09-26 13:52:57 -07:00
72ebe97ee8
fix: lifecycle-hooks.jade.
2016-09-26 15:56:44 +01:00
1523fedcf0
Merge remote-tracking branch 'origin/master'
2016-09-26 15:15:09 +01: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
623c799771
微调，增补了社区贡献者
2016-09-26 20:44:35 +08:00
9970094fcb
Fix broken link to DatePipe docs ( #2452 )
...
Fixes issue #2451
2016-09-25 18:55:14 -07:00
6def9505cc
chore: convert templateUrls to use moduleId where possible. ( #2477 )
2016-09-25 18:51:54 -07:00
6e17d33475
chore: update samples to "angular-in-memory-web-api" ( #2472 )
...
chore: update samples to "angular-in-memory-web-api"
2016-09-25 15:24:13 -07:00
738b714bd3
docs(testing): change createInstance to createComponent ( #2475 )
2016-09-25 15:12:04 -07:00
3ee19780b5
docs(testing): incorporate Igor Minar feedback, Part 2 ( #2453 )
...
docs(testing): incorporate Igor Minar feedback, Part 2
2016-09-25 15:07:53 -07:00
rexebin
Ward Bell
Kapunahele Wong
Torgeir Helgevold
Zhicheng Wang
Matthew Hegarty
Brandon
Alireza Mirian
Jonas Felix
Chase
Cody Lundquist
guichi
Jesús Rodríguez
John Papa
Josh Kramer