jin-xinchen
|
858fdfb600
|
Update ngmodule.jade
中文原文：“这解决了在文件中使用指令_类型_时的冲突问题，但是还有另一个问题问题没有解决，我们将在[后面](#resolve-conflicts)讨论它。”
重复的”问题问题“
|
2017-04-16 19:42:11 +08:00 |
Zhicheng Wang
|
011606fa1f
|
合并后微调
|
2017-04-16 19:36:34 +08:00 |
|
Zhicheng Wang
|
44433258bb
|
Merge branch 'patch-1' of git://github.com/jin-xinchen/angular-cn
# Conflicts:
# public/docs/ts/latest/tutorial/toh-pt6.jade
|
2017-04-16 19:35:38 +08:00 |
|
Zhicheng Wang
|
ffabcb6241
|
Merge branch 'master' of git://github.com/tkisme/angular-cn
# Conflicts:
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
|
2017-04-16 19:34:15 +08:00 |
|
Zhicheng Wang
|
a13dfe9276
|
Merge branch 'fix_guide_forms' of git://github.com/baiyangcao/angular-cn
# Conflicts:
# public/docs/ts/latest/guide/forms.jade
|
2017-04-16 19:30:38 +08:00 |
baiyangcao
|
ec19287654
|
complete untranslated part of guid - setup.jade
|
2017-04-16 19:26:56 +08:00 |
|
Zhicheng Wang
|
c48406cb9f
|
Merge branch 'fix_toh_pt6' of git://github.com/baiyangcao/angular-cn
# Conflicts:
# public/docs/ts/latest/tutorial/toh-pt6.jade
|
2017-04-16 19:25:56 +08:00 |
|
Zhicheng Wang
|
458da034e8
|
手工应用jin-xinchen的patch
|
2017-04-16 19:17:19 +08:00 |
|
Zhicheng Wang
|
a309bb91f6
|
手工应用jin-xinchen的patch
|
2017-04-16 19:16:05 +08:00 |
|
jin-xinchen
|
7d10481417
|
Update lifecycle-hooks.jade
|
2017-04-16 19:11:10 +08:00 |
|
Zhicheng Wang
|
2b33a27f85
|
翻译完change-log
|
2017-04-16 19:09:39 +08:00 |
|
Zhicheng Wang
|
c8900075a2
|
修订完presskit
|
2017-04-16 19:01:15 +08:00 |
|
Zhicheng Wang
|
b7de02f84f
|
修订完glossary
|
2017-04-16 18:41:03 +08:00 |
|
Zhicheng Wang
|
ed206e74a7
|
修订完cli-quickstart
|
2017-04-16 18:30:54 +08:00 |
|
Zhicheng Wang
|
409e17fab4
|
修订完toh6
|
2017-04-16 18:22:16 +08:00 |
|
Zhicheng Wang
|
b7b93abd71
|
修订完toh5
|
2017-04-16 18:10:20 +08:00 |
|
Zhicheng Wang
|
90f58a8b4c
|
修订完toh4
|
2017-04-16 17:04:44 +08:00 |
|
Zhicheng Wang
|
5561073842
|
修订完toh3
|
2017-04-16 17:00:21 +08:00 |
|
Zhicheng Wang
|
866238ffca
|
修订完toh2
|
2017-04-16 16:56:40 +08:00 |
|
Zhicheng Wang
|
30931c9b2f
|
修订完toh1
|
2017-04-15 23:34:54 +08:00 |
|
Zhicheng Wang
|
cf546a7f45
|
修订完webpack
|
2017-04-15 23:31:14 +08:00 |
|
Zhicheng Wang
|
7a0137d5a5
|
修订完upgrade
|
2017-04-15 23:25:23 +08:00 |
|
Zhicheng Wang
|
04c77dc05a
|
修订完testing
|
2017-04-15 23:19:41 +08:00 |
|
Zhicheng Wang
|
4b7daad85b
|
修订完style guide
|
2017-04-15 22:58:44 +08:00 |
|
Zhicheng Wang
|
8b003d4015
|
修订完structural directives
|
2017-04-15 22:50:09 +08:00 |
|
Zhicheng Wang
|
32718328dc
|
修订完setup-systemjs-anatomy
|
2017-04-15 22:42:11 +08:00 |
|
Zhicheng Wang
|
b7869884c4
|
修正一个编译错误
|
2017-04-15 22:41:14 +08:00 |
|
Zhicheng Wang
|
a50bf1832e
|
修订完server-communication
|
2017-04-15 22:39:40 +08:00 |
|
Zhicheng Wang
|
70e77a29ef
|
修订完security
|
2017-04-15 22:33:30 +08:00 |
lizhonghui
|
0ce88ece13
|
fix(webpack): translation optimize
(cherry picked from commit a3364d8)
|
2017-04-15 22:27:46 +08:00 |
|
lizhonghui
|
8fdfdf5d1a
|
fix(webpack): complete untranslated part of webpack chapter
(cherry picked from commit 48c9d68)
|
2017-04-15 22:26:51 +08:00 |
|
Zhicheng Wang
|
9db69011c3
|
修订完router
|
2017-04-15 22:15:28 +08:00 |
|
Zhicheng Wang
|
5f20e0ce45
|
修订完pipes
|
2017-04-15 22:05:07 +08:00 |
|
Zhicheng Wang
|
6383abb6b3
|
修订完npm-packages
|
2017-04-15 21:56:49 +08:00 |
|
Zhicheng Wang
|
7a8d65353b
|
修订完ngmodules
|
2017-04-15 21:54:53 +08:00 |
|
Zhicheng Wang
|
7e81cc60d9
|
修订完lifecycle-hooks
|
2017-04-15 21:46:13 +08:00 |
|
Zhicheng Wang
|
a1c811f763
|
修订完index
|
2017-04-15 21:38:27 +08:00 |
|
Zhicheng Wang
|
d33efdab08
|
修订完hierarchical-DI
|
2017-04-15 21:36:40 +08:00 |
|
Zhicheng Wang
|
116308caa2
|
修订完forms
|
2017-04-15 21:34:03 +08:00 |
|
Zhicheng Wang
|
81dd3a76cf
|
修订完displaying data
|
2017-04-15 21:30:38 +08:00 |
|
Zhicheng Wang
|
e12b29a434
|
修订完DI
|
2017-04-15 21:27:07 +08:00 |
|
Zhicheng Wang
|
8eff508115
|
修订完component-styles
|
2017-04-15 21:12:54 +08:00 |
|
Zhicheng Wang
|
b83320c3da
|
修订完change-log
|
2017-04-15 21:06:34 +08:00 |
|
Zhicheng Wang
|
bddd8a818d
|
修订完browser-support
|
2017-04-15 21:03:37 +08:00 |
|
Zhicheng Wang
|
2a313651d2
|
修订完attribute-directives
|
2017-04-15 21:03:04 +08:00 |
|
Zhicheng Wang
|
ab9cd412e6
|
修订完architecture
|
2017-04-15 19:02:32 +08:00 |
|
Zhicheng Wang
|
61c50048ea
|
修订完appmodule
|
2017-04-15 18:59:35 +08:00 |
|
Zhicheng Wang
|
0a803ec991
|
修订完animation
|
2017-04-15 18:56:22 +08:00 |
|
Zhicheng Wang
|
d00b09e1dc
|
修订完vs 2015
|
2017-04-15 18:53:36 +08:00 |
|
Zhicheng Wang
|
7448a25f18
|
修订完ts-to-js
|
2017-04-15 18:49:55 +08:00 |
|
Zhicheng Wang
|
389ea147ab
|
修订完set-document-title
|
2017-04-15 18:48:44 +08:00 |
|
Zhicheng Wang
|
e65fc98f11
|
修订完ngmodel-faq
|
2017-04-15 18:47:47 +08:00 |
|
Zhicheng Wang
|
d73d594644
|
修订完index
|
2017-04-15 17:44:38 +08:00 |
|
Zhicheng Wang
|
e11496b4f0
|
修订完i18n
|
2017-04-15 17:43:32 +08:00 |
|
Zhicheng Wang
|
cbb8d7513c
|
修订完form validation
|
2017-04-15 17:40:39 +08:00 |
|
Zhicheng Wang
|
06603f6081
|
修订完dynamic form
|
2017-04-15 17:30:20 +08:00 |
|
Zhicheng Wang
|
dd08539726
|
修订完DI
|
2017-04-15 17:28:53 +08:00 |
|
Zhicheng Wang
|
896e5b6ce1
|
修订完component-communication
|
2017-04-15 17:12:11 +08:00 |
|
Zhicheng Wang
|
f656c40847
|
修订完aot-compiler
|
2017-04-15 16:59:00 +08:00 |
|
Zhicheng Wang
|
3f29b4df40
|
修订完data.json
|
2017-04-15 16:49:09 +08:00 |
|
Zhicheng Wang
|
8bf42bec1a
|
修订完ajs-quick-ref
|
2017-04-15 16:47:27 +08:00 |
|
Zhicheng Wang
|
505d93e0ce
|
清理不必要的!{变量
|
2017-04-15 16:25:31 +08:00 |
|
Zhicheng Wang
|
473c688f70
|
清理不必要的#{变量
|
2017-04-15 16:13:16 +08:00 |
|
Zhicheng Wang
|
3b9708283a
|
修正所有合并时出现在中间位置的+makeExample等函数
|
2017-04-15 16:02:59 +08:00 |
|
Zhicheng Wang
|
26ba602922
|
为方法加上括号
|
2017-04-15 15:58:08 +08:00 |
|
Zhicheng Wang
|
f5c85b3e82
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# README.md
# public/_data.json
# public/_includes/_hero-home.jade
# public/_includes/_main-nav.jade
# public/_includes/_scripts-include.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cheatsheet.jade
# public/docs/ts/latest/cli-quickstart.jade
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/ajs-quick-reference.jade
# public/docs/ts/latest/cookbook/aot-compiler.jade
# 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/form-validation.jade
# public/docs/ts/latest/cookbook/i18n.jade
# public/docs/ts/latest/cookbook/index.jade
# public/docs/ts/latest/cookbook/ngmodule-faq.jade
# public/docs/ts/latest/cookbook/set-document-title.jade
# public/docs/ts/latest/cookbook/ts-to-js.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/appmodule.jade
# 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/component-styles.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/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/learning-angular.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/pipes.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/setup-systemjs-anatomy.jade
# public/docs/ts/latest/guide/setup.jade
# public/docs/ts/latest/guide/structural-directives.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/_data.json
# 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
# public/events.jade
# public/news.jade
# public/presskit.jade
|
2017-04-15 15:34:47 +08:00 |
Kapunahele Wong
|
9bb44197ec
|
docs(i18n): apply guidelines and update TOCs (#3535)
|
2017-04-12 12:18:38 -07:00 |
|
Kapunahele Wong
|
8554e38dd2
|
docs(doc-title-cookbook): apply guidelines (#3537)
|
2017-04-12 12:08:44 -07:00 |
Jesús Rodríguez
|
8f1acc5b43
|
chore: make the moduleid loader working on safari (#3532)
|
2017-04-12 12:03:52 -07:00 |
|
Jesús Rodríguez
|
faf3ca6837
|
docs(toh-pt3): fix broken link (#3533)
|
2017-04-12 12:03:11 -07:00 |
|
Jesús Rodríguez
|
1603cbbc98
|
docs(style-guide): a few fixes (#3534)
|
2017-04-12 11:54:37 -07:00 |
|
Jesús Rodríguez
|
3239ebca8d
|
chore: enable old ignored tests (#3531)
|
2017-04-12 15:31:20 +02:00 |
|
Jesús Rodríguez
|
0bf521271b
|
docs(webpack): update for v4 (#3530)
|
2017-04-12 14:57:01 +02:00 |
Ward Bell
|
1ec0d7621d
|
docs(events): removed events that have passed (#3529)
|
2017-04-11 20:48:27 -07:00 |
Alireza Mirian
|
c3ef2374b4
|
docs(structural-directives): add links to source (#3377)
Guide suggests reading *ngIf* and *ngFor* sources. They are linked to github now.
|
2017-04-11 20:31:02 -07:00 |
Sergey Samsonov
|
f370f04267
|
docs(toh-6): fix typos about Promise and Observable with Dart artifacts (#3436)
|
2017-04-11 20:24:46 -07:00 |
William KOZA
|
1fe891f1c8
|
fix(guide): Message in dev mode has changed (#3439)
|
2017-04-11 20:20:32 -07:00 |
|
Ward Bell
|
0bbf94c3d8
|
docs(cheatsheet): template -> ng-template (#3528)
|
2017-04-11 20:07:49 -07:00 |
|
William KOZA
|
252dd5fdf4
|
docs(structural-directives): <template> was replaced by <ng-template> (#3445)
|
2017-04-11 19:59:12 -07:00 |
|
Jesús Rodríguez
|
69294a25c2
|
docs(testing): port to Angular v4 (#3524)
|
2017-04-11 19:42:05 -07:00 |
Adhithya Rajagopalan
|
2ee67655f3
|
docs(toh-3): corrected incorrect displayed file name in tutorial (#3457)
|
2017-04-11 19:37:07 -07:00 |
Double-A-92
|
f1c6220857
|
Update toh-pt1.jade (#3495)
The 'hero' property is in the AppComponent class, not in Hero.
|
2017-04-11 19:34:15 -07:00 |
Patrice Chalin
|
7784faa180
|
docs(toh-2): copyedits (#3504)
|
2017-04-11 19:24:48 -07:00 |
Sergey Koshechkin
|
71c862d51a
|
docs(reactive-forms): fix "Setup guide" link (#3517)
|
2017-04-11 19:23:34 -07:00 |
|
Kapunahele Wong
|
01f0f6dec0
|
docs(forms): move template reference var higher in doc (#3521)
|
2017-04-11 19:21:47 -07:00 |
Tobyn Baugher
|
10dd5b8bf0
|
docs(DI): remove misplaced "span" (#3522)
|
2017-04-11 19:20:43 -07:00 |
|
Kapunahele Wong
|
6a9007c65b
|
docs(dynamic-forms): edit copy to guidelines standards (#3525)
|
2017-04-11 19:17:23 -07:00 |
|
Kapunahele Wong
|
0cf98324a8
|
docs(toh-pt5): fix capitalization of Router & update screenshot (#3526)
|
2017-04-11 19:14:23 -07:00 |
|
Kapunahele Wong
|
4d44cde291
|
docs(reactive-forms): fix typo in link (#3527)
|
2017-04-11 19:11:54 -07:00 |
Ryan Nickel
|
814a64a932
|
docs(reactive-forms): fix typo (#3509)
|
2017-04-09 17:21:21 +02:00 |
Richard Bützer
|
6243fd036c
|
docs(forms): fix typo (#3507)
|
2017-04-05 12:05:29 +02:00 |
|
Jesús Rodríguez
|
21bd32f736
|
chore: make moduleId loader work with karma (#3499)
|
2017-04-04 00:15:49 +02:00 |
Andy Costanza
|
918ae9996f
|
docs(toh-pt6) : update htttp.get() to http.get() (#3498)
|
2017-04-03 23:46:32 +02:00 |
|
Ward Bell
|
86dce5227c
|
chore(aio): no more anchors followed immediately by md header (#3489)
|
2017-04-01 16:29:53 -07:00 |
|
Ward Bell
|
914823a47a
|
aio(style-guide): adjust to support migration to aio (#3490)
|
2017-04-01 15:13:42 -07:00 |
|
Jesús Rodríguez
|
58e5fbe007
|
chore: miscelanea fixes for new aio (#3491)
|
2017-04-02 00:12:45 +02:00 |
Tay Yang Shun
|
6fa6a1d328
|
fix: misc typos in three files (#3463)
|
2017-04-01 11:38:49 -07:00 |
|
Jesús Rodríguez
|
6f17693022
|
docs(toh-5): revert snippet indentation (#3487)
|
2017-04-01 11:32:39 -07:00 |
|
Kapunahele Wong
|
4f87145170
|
docs(dyn-comp-loader): add explanations for methods, add doc structure, plunker (#3451)
|
2017-04-01 11:31:05 -07:00 |
|
Ward Bell
|
cd0c36340e
|
docs(toh-2): move app.component.1.html (#3488)
|
2017-04-01 11:06:30 -07:00 |