honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,506 Commits 5 Branches 1 Tag
Commit Graph

98 Commits

Author SHA1 Message Date
Zhimin YE (Rex)
b73cb2e1a1 update router.jade. 2016-08-23 14:20:49 +01: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
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
Brandon Roberts
420b9ca59e docs(router): Fixed lazy loading initial example 
closes #2070
 2016-08-09 20:00:08 -07:00
Peter Bacon Darwin
d79adb2422 docs(rc5): update docs and plunkers for rc5 2016-08-09 11:48:07 -07:00
Zhicheng Wang
251d4ffe6c 合并了官方的最新更新 2016-08-06 20:04:41 +08:00
Zhicheng Wang
d034bc33c8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/contribute.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.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/forms.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
 2016-08-06 19:52:08 +08:00
Matt Ezell
28174673fe docs(router): formatting - Back Quote to Wrap Identifier 
closes #2020
 2016-08-05 17:03:25 -07:00
Brandon Roberts
b93fb12fea chore(examples): Updated live example links to use helper directive 
closes #2005
 2016-08-05 16:41:45 -07:00
Zhicheng Wang
e8d0dab89c #44 根据 @edtim8 的建议做了更正。 2016-08-03 13:56:08 +08:00
Zhicheng Wang
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
Kyle Roberts
ce8b94799c docs(Router): remove duplicate "activated" 
closes #1957
 2016-07-25 10:14:55 -07:00
Zhicheng Wang
5532c54ff7 翻译完了一部分新增英文内容 2016-07-24 22:06:39 +08:00
Zhicheng Wang
4400deeef8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	gulpfile.js
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/resources/js/controllers/resources-controller.js
 2016-07-24 17:27:48 +08:00
Brandon Roberts
2e3f3e7fb1 docs(router): Minor dev guide fixes 
closes #1932
 2016-07-19 22:15:21 -07:00
Brandon Roberts
f056a2d5d2 docs(router): Added content updates to developer guide 
closes #1905
Added section for RouterLinkActive
Added section for global query params and fragments
Added section for RouterState
Added wildcard route to example configuration
Updated code samples
Renamed .guard files to .service
Renamed interfaces.ts to can-deactivate-guard.service.ts
Removed unused files
 2016-07-18 15:21:09 -07:00
Zhicheng Wang
7c2da09b21 语言微调 2016-07-18 14:30:01 +08:00
Zhicheng Wang
3e9394f62a 校对合并结果 2016-07-16 17:47:55 +08:00
Zhimin YE (Rex)
0e14785cba Merge remote-tracking branch 'angular.io/master' 
# Conflicts:
#	README.md
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-07-15 15:52:34 +01:00
Zhicheng Wang
221f00c8b7 根据Hongbo-Miao的建议修正了一些问题 2016-07-14 16:48:52 +08:00
Zhicheng Wang
46ea47d126 添加dialog.service导致了编译错误，修正回去 2016-07-12 13:52:49 +08:00
Foxandxss
50b51f6bdc docs(router): fix broken links in router chapters 
closes #1843
 2016-07-11 21:57:15 -07:00
Brandon Roberts
5104470558 docs(router): Removed refs to deprecated router; lowerCamelCase constants 
closes #1834
 2016-07-11 21:44:12 -07:00
Zhicheng Wang
f6eba2df5e 根据gogobook的反馈添加了dialog.service 
鸣谢里添加了给出反馈的github网友
 2016-07-11 13:04:16 +08:00
Zhicheng Wang
273a0fd1e8 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/webpack.jade
 2016-07-11 08:32:56 +08:00
Zhicheng Wang
6264d3bcde 批量把Provider/provide改译为提供商/提供，以和ISP（互联网服务提供商）的译法看齐 2016-07-07 08:22:36 +08:00
Zhicheng Wang
0303a18020 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
 2016-07-07 08:15:51 +08:00
Ward Bell
d1dd2b82f4 docs(router): changes suggested by Deb Kurata in #1808 2016-07-06 01:11:34 -07:00
Stephen Fox
e766f666bd docs(http): Small typo fix in sentence reference to items: Observable 
Ward tacked on router: ngDestroy -> ngOnDestroy
closes #1690
 2016-07-05 20:55:03 -07:00
Zhimin(Rex) YE
3184375783 correction: router sample correction 2016-07-03 17:38:33 +01:00
Zhicheng Wang
711a173606 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/guide/router.jade
 2016-07-03 15:27:10 +08:00
Ward Bell
fdbb7b5184 docs(router): clarify router redirect and link to Victor's blog post 2016-07-02 15:51:49 -07:00
Zhicheng Wang
3c5a045633 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/guide/router.jade
 2016-07-02 19:16:00 +08:00
Foxandxss
1900eb1c70 docs: replace terminal with pathMatch, base href with '/' 
closes #1799
 2016-07-01 16:32:39 -07:00
Zhicheng Wang
0dd2932a2e Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/news.jade
#	public/resources/_data.json
#	public/resources/index.ejs
#	public/resources/js/controllers/resources-controller.js
 2016-07-01 08:38:54 +08:00
Zhicheng Wang
dfc20a6adc Merge remote-tracking branch 'cn/master' 2016-07-01 08:25:35 +08:00
Zhicheng Wang
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
Foxandxss
909f230cc7 update router to beta.1 2016-06-30 13:04:04 -07:00
eltronix
19d2e4ef4c Fixed typo 2016-06-30 11:51:53 -07:00
Zhimin YE (Rex)
43f400487e docs(router): explicit explaination of terminal property 2016-06-30 11:51:39 -07:00
Zhimin YE (Rex)
b97f82a171 review(router): first review is done. 2016-06-30 12:20:05 +01:00
Rex
f4c56cbae6 router.jade: review to line 2088 2016-06-29 22:16:12 +01:00
eltronix
2bd79e8482 Fixed Rendering error 2016-06-29 12:27:44 -07:00
Rex
397a1247b8 router.jade review to line 1586 2016-06-29 19:43:59 +01:00
Zhimin YE (Rex)
d5728d8b1c minor correction to quickstart.jade and review of router.jade to line 903. 2016-06-29 17:04:22 +01:00
priestch
b21c90c358 fix(doc): fix 404 problem of some api url 2016-06-28 22:25:24 -07:00
Fabriece Sumuni
8d7e7a0187 fixed a formatting typo on line 1015 2016-06-28 16:18:12 -07:00
Kai Ruhnau
26027105a7 docs(router): Fix the link to the APP_BASE_HREF page 2016-06-28 12:52:47 -07:00
Zhimin(Rex) YE
8e2299de2a review of router.jade, to line 429 2016-06-28 20:45:40 +01:00