dusthub
f38478893a
fix translation repeated
2016-11-27 15:58:08 +08:00
Rex YE
7f022c153b
fix aot-compiler, router and upgrade
2016-11-22 15:21:36 +00:00
Yang Lin
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +08:00
rexebin
de3b5cd6ce
translate: router - pre-loading...
2016-11-03 22:44:27 +00:00
rexebin
85b0863bdd
fix minor issues with router.jade.
2016-11-03 21:11:24 +00:00
Zhimin YE
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
Zhimin YE
2ba0cc70f7
fix : #107
2016-11-01 10:07:23 +00:00
Ward Bell
8a3d061305
docs(router): fix grammar typo in preloader section ( #2700 )
...
tweaks some other related language.
2016-10-31 01:17:27 -07:00
Aristeidis Bampakos
32f3ed973d
docs(router): Fix typos ( #2666 )
2016-10-31 00:55:08 -07:00
Jesús Rodríguez
b58e51a038
docs(router): broken link to DI chapter ( #2662 )
2016-10-25 19:52:44 +02:00
Zhimin YE
c0cabddd69
fix: routing
2016-10-25 13:09:12 +01:00
Hongbo Miao
60101cc797
fix translation mistake
2016-10-24 22:24:15 -04:00
Hongbo Miao
804206ca87
fix translation mistake
2016-10-24 20:04:47 -04:00
Filipe Silva
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
leiermeng
63bac4eba5
fix: guide/router some error
2016-10-20 14:50:54 +08:00
Brandon
2f5306f1b6
docs(router): Added example of feature module pre-loading ( #2595 )
...
* added example of feature module pre-loading
* added transition aliases for route animations
2016-10-19 22:02:47 -07:00
Zhimin YE
183633b0e3
fix: router and testing
2016-10-18 14:57:39 +01:00
Timothy Curchod
47b51dad68
docs(toh-pt6,guide): fix a grammatical error ( #2594 )
2016-10-18 15:05:56 +02:00
rexebin
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
Zhicheng Wang
72b0ec623e
lazy-loading统一翻译为惰性加载
2016-10-11 16:26:41 +08:00
Zhicheng Wang
e1fd53b9b3
更正individual的翻译
2016-10-06 20:48:24 +08:00
Zhicheng Wang
41b0cc800b
更正了technically的翻译
2016-10-06 20:37:42 +08:00
Zhicheng Wang
78418f4d3c
调整additional的翻译
2016-10-06 19:38:32 +08:00
Matthew Hegarty
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
Brandon
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
guichi
ba5e194acd
Update router.jade
...
改正错误
2016-09-27 16:25:02 +08:00
rexebin
f7c60a07df
fix： change all 他 > 它
2016-09-25 19:50:45 +01:00
rexebin
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
Jesús Rodríguez
693f6ae462
chore: rename Angular 2 to simply Angular ( #2402 )
2016-09-19 20:24:40 -07:00
Zhimin YE (Rex)
6aeb8efaa3
fix: live example localisation.
2016-09-19 10:03:53 +01:00
Sarun Intaralawan
c6cf4dc310
docs(router): add missing backticks ( #2366 )
2016-09-17 23:56:55 +02:00
Zhicheng Wang
6f6f89ed9c
把所有“内建”改为“内置”
2016-09-17 11:46:17 +08:00
Zhicheng Wang
96bfb764a1
翻译了一部分未翻译的合并
2016-09-16 15:50:21 +08:00
Zhicheng Wang
bd29d09085
翻译了一部分未翻译的合并
2016-09-16 13:21:27 +08:00
Zhicheng Wang
e693d35fb1
合并了最新更新，翻译了官方的发布声明
2016-09-15 17:08:17 +08:00
Zhicheng Wang
2417245114
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/_data.json
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_hero.jade
# public/_includes/_main-nav.jade
# public/_includes/_util-fns.jade
# public/docs/_includes/_side-nav.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.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/ngmodule.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/style-guide.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/testing/_data.json
# public/docs/ts/latest/testing/application-under-test.jade
# public/docs/ts/latest/testing/first-app-tests.jade
# public/docs/ts/latest/testing/index.jade
# public/docs/ts/latest/testing/jasmine-testing-101.jade
# public/docs/ts/latest/testing/testing-an-angular-pipe.jade
# public/index.jade
# public/resources/css/main.scss
# public/resources/css/module/_side-nav.scss
2016-09-15 15:23:48 +08:00
Brandon Roberts
c15a68e591
docs(router): Added and organized more router dev guide content
...
Moved all heroes functionality into milestone 2
Crisis Center initial functionality is milestone 3
Admin feature module as milestone 4 including route guard examples
Updated milestone 5 to lazy load admin feature module
Added examples for CanLoad, CanActivateChildren guard, component-less routes
Added section on explanation of ActivatedRoute
Added section on animating route components
Added section on relative navigation
2016-09-14 13:46:16 -07:00
Zhicheng Wang
2a1c3626c5
去掉了大部分儿化音
...
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
Zhicheng Wang
3d40a26655
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cheatsheet.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/quickstart.jade
2016-09-11 21:20:58 +08:00
Patrice Chalin
15c50d76a2
docs(*): fix broken links in glossary and router chapter ( #2279 )
...
- Glossary: `#ecmascript=2015` is not a valid fragment.
- Router: `<a name=“…”>` needed to be `<a id=“…”>`.
2016-09-07 16:48:43 -07:00
Zhimin YE (Rex)
c307083546
patch: router.jade.
2016-08-24 16:48:24 +01:00
Zhimin YE (Rex)
b73cb2e1a1
update router.jade.
2016-08-23 14:20:49 +01:00
Brandon Roberts
a35fcb4dfd
chore(router): Added ModuleWithProviders to routing exports
...
closes #2113
2016-08-18 23:57:54 -07:00
Trotyl Yu
4f9bf774ee
docs(router): Fix typo of missing symbol
...
closes #2111
2016-08-17 16:46:52 -07:00
Zhicheng Wang
60bdd86c32
文字微调
2016-08-17 23:16:50 +08:00
Zhimin YE (Rex)
f5465ad533
review: patch up router.jade.
2016-08-16 14:17:39 +01:00
Patrice Chalin
ea457825b8
docs(router): fix markdown, and example mixin cleanup ( #2101 )
...
* docs(router): fix markdown and example mixin cleanup
- Fixed: markdown text not under `:marked` region (and so that text was
not showing up in the generated html).
- Fixed: code excerpt title `constructor` -> `isSelected`.
- Cleanup of all makeExample mixin uses.
This cleanup will help make it easier to record differences with the
deprecated router chapter (which must have app-relative makeExample
paths).
* post-review updates
Found another instance of markdown (a heading) outside of a `:marked` region.
2016-08-12 11:20:44 -07: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
Ward Bell
d412470b38
Update router.jade
2016-08-09 22:29:27 -07:00
Brandon Roberts
420b9ca59e
docs(router): Fixed lazy loading initial example
...
closes #2070
2016-08-09 20:00:08 -07:00
