Zhimin YE (Rex)
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
Ward Bell
6def9505cc
chore: convert templateUrls to use moduleId where possible. ( #2477 )
2016-09-25 18:51:54 -07:00
rexebin
f7c60a07df
fix： change all 他 > 它
2016-09-25 19:50:45 +01:00
rexebin
a59b1b60ee
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/testing.jade
2016-09-23 23:22:42 +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
Ward Bell
b478aaf7a2
docs(testing): from Igor Minar feedback (Part 1) ( #2450 )
2016-09-23 02:03:20 -07:00
Trotyl Yu
6bf7db584c
docs(vs2015): fix typo ( #2440 )
2016-09-22 11:42:16 +02:00
Trotyl Yu
aab6d8c523
docs(vs2015): remove duplicated word ( #2441 )
2016-09-22 11:40:35 +02:00
倪述荣
1f47f27c9e
修正一个笔误：重新编译
2016-09-22 15:27:49 +08:00
Prashant Mahajan
36c7224ff9
Update visual-studio-2015.jade ( #2416 )
...
* Update visual-studio-2015.jade
In Step 7 (Build and Run App), there needs to be instruction to set index.html as start page, so that when Run button or F5 is pressed to run the application, browser shows index.html
* Update visual-studio-2015.jade
2016-09-21 11:32:07 -07:00
Patrice Chalin
0f99a7c130
docs(cookbook): don't use shredder on intro page ( #2418 )
...
Also added missing cookbook AoT chapter placeholders for JS and Dart,
fixing 404s mentioned in #2389 .
2016-09-20 10:59:14 -07:00
Jesús Rodríguez
693f6ae462
chore: rename Angular 2 to simply Angular ( #2402 )
2016-09-19 20:24:40 -07:00
Patrice Chalin
0c678c2355
docs: use Jade include rather than Harp partial ( #2392 )
...
No net effect on the generated docs.
Preparatory work for ng2.io.
2016-09-19 20:08:03 -07:00
rexebin
de6b8d6ad0
review: ngmodule-faq, done.
2016-09-18 22:32:25 +01:00
rexebin
b7568e4649
Merge branch 'master' of https://github.com/angular/angular-cn
2016-09-18 18:46:39 +01:00
rexebin
3f9144eec2
review: ngmodule-faq: line 980
2016-09-18 17:10:44 +01:00
Zhicheng Wang
efc7326926
微调
2016-09-18 10:20:47 +08:00
Zhicheng Wang
a2a5768982
微调
2016-09-18 10:03:20 +08:00
Zhicheng Wang
c648a4dd60
微调
2016-09-18 10:02:02 +08:00
Zhicheng Wang
3845d73234
翻译完了RC4 to RC5
...
把AoT的中文翻译统一成预编译
2016-09-18 09:42:13 +08:00
rexebin
d45052ab8c
review: ngmodule-faq to line 153
2016-09-17 20:26:51 +01:00
Zhicheng Wang
6f6f89ed9c
把所有“内建”改为“内置”
2016-09-17 11:46:17 +08:00
Zhicheng Wang
50f73986be
翻译完了NgModule FAQ
...
少量错别字修改
2016-09-17 11:45:56 +08:00
Zhicheng Wang
0db676a23c
翻译了一部分NgModule FAQ
2016-09-16 20:45:50 +08:00
Zhicheng Wang
b2fcb1a2e6
翻译完了AoT compiler
2016-09-16 18:13:42 +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
Jesús Rodríguez
d64cb11635
docs(aot): remove typescript instruction
2016-09-14 14:49:25 -07:00
Naomi Black
053ecc2b10
docs(aot): More consistency edits to aot/jit
2016-09-14 13:55:23 -07:00
Naomi Black
bc804322c4
docs(aot): update nav to be consistent with aot hyphenation
2016-09-14 10:55:46 -07:00
Torgeir Helgevold
6813ced018
docs(cookbook - aot compiler) ( #2161 )
...
docs(cb-aot-compiler): new cookbook on AoT compiler
2016-09-14 10:10:04 -07:00
Zhicheng Wang
551f3dd51a
更新了cheatsheet
...
翻译了一部分FAQ
2016-09-14 21:12:14 +08:00
Deborah Kurata
a52d8c3e76
docs(validation): Change to 'Table of Contents'
...
Same change to NgModules
closes #2315
2016-09-13 20:46:36 -07:00
Kapunahele Wong
c5a1a88042
a1-a2 quick ref copy edits ( #2255 )
...
* a1-a2 quick ref copy edits
* copy edits, 2nd pass
* Glossary Edits
* 1-2 quick ref copy edits, pass 2
2016-09-13 14:56:29 -07:00
Ward Bell
c5ad38ee86
docs(ngmodule-faq): eager loaded Routed Feature Module must be imported ( #2304 )
...
fixes #2298
2016-09-13 12:27:27 -07:00
Jesús Rodríguez
98e5bc248e
docs(ngmodule-faq): fix plunker link ( #2277 )
2016-09-13 12:27:13 -07:00
jmcgoldrick
e1b2f6a2fe
docs(ngmodule-faq): correct BrowserModule import module ( #2269 )
2016-09-13 12:24:59 -07:00
Zhicheng Wang
2a1c3626c5
去掉了大部分儿化音
...
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
Zhicheng Wang
ab06793705
对上次的合并查漏补缺
2016-09-10 18:31:38 +08:00
Zhicheng Wang
446acfd81b
对上次的合并查漏补缺
2016-09-10 18:07:25 +08:00
Zhicheng Wang
969da7d321
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/_includes/_scripts-include.jade
# public/docs/_examples/homepage-hello-world/ts/index.1.html
# public/docs/_examples/homepage-tabs/ts/index.1.html
# public/docs/_examples/homepage-todo/ts/index.1.html
# public/docs/_examples/systemjs.config.plunker.build.js
# public/docs/_examples/systemjs.config.plunker.js
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/cookbook/component-relative-paths.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# 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/index.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/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/typescript-configuration.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/toh-pt6.jade
# public/features.jade
# public/resources/js/directives/live-example.js
# tools/plunker-builder/indexHtmlTranslator.js
2016-09-08 17:20:01 +08:00
Patrice Chalin
59f6ebe849
docs(*): misc fixes to prose in support of jade2ng ( #2266 )
...
Fixes to prose “syntax”. Anomalies detected by jade2ng.
Also updated the main _utils-fn.jade in support of jade2ng as well.
2016-09-06 10:28:24 -07:00
Ward Bell
38bef16604
docs(ngmodule-faq): stronger, clearer advice on where to register providers ( #2262 )
2016-09-03 13:26:19 -07:00
Ward Bell
18ec087f07
docs(forms): fix css, form validation e2e, other tweaks ( #2235 )
2016-08-31 18:15:14 -07:00
Ward Bell
1212b5147f
docs(cb-form-validation): add template2 - a step between template and reactive
...
Raises questions about what really separates Forms from ReactiveForms
2016-08-31 01:15:05 -07:00
Ward Bell
f971685a7c
docs(cb-form-validation): ward's tweaks
...
renamed from cb-validation to cb-form-validation
other refactorings and text changes
2016-08-30 14:53:23 -07:00
Deborah Kurata
3b4a5d533d
docs(cb-form-validation): create Form Validation Cookbook
2016-08-30 14:53:23 -07:00
Ward Bell
8e15829189
docs(ngmodule): fixes for defects discovered by John Papa ( #2197 )
...
includes splitting FAQs into its own cookbook.
2016-08-25 19:12:15 -07:00
Jesús Rodríguez
9ec4cbf3a4
docs(component-relative): tweak webpack explanation
...
closes #2157
Fixes #2156
2016-08-24 23:40:52 -07:00
