Zhicheng Wang
fa4730c72c
合并最新版本
...
解决错误格式化导致的无法加载源文件问题
2017-06-01 21:23:32 +08:00
Zhicheng Wang
53e50f64cf
Merge remote-tracking branch 'en/master'
...
# Conflicts:
# public/docs/ts/latest/guide/_data.json
2017-06-01 21:11:32 +08:00
Filipe Silva
3980a1bb4f
docs(universal): remove nav link ( #3549 )
2017-05-16 09:37:30 -07:00
Zhicheng Wang
9a2dfde114
内容微调
2017-04-24 21:13:14 +08:00
Zhicheng Wang
632d15710c
调整章节顺序
2017-04-24 21:13:13 +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
Ward Bell
5738c4b66a
docs(universal): add guide ( #3378 )
...
* docs(universal): add guide
* gulpfile: Replace 'rm -rf' with 'node rimraf' so install-example-angular will work on Windows
* Get universal working
* doc wip
* gulpfile: Add platform-server to install-example-angular
* Update toh code in universal sample - remove moduleId
* Update typescript to 2.2.1 when we install-example-angular --build
* move example files; add graphs
* demo and docs wip
* doc wip
* Fix toc
* add toc, link
2017-03-31 17:20:59 +01:00
Kapunahele Wong
de00e0310e
docs(toh, guide, cookbook): add periods to banners ( #3350 )
2017-03-06 15:56:49 -08:00
cfranger
5985dc9cec
docs(NgModules): Edits to change Angular Modules to NgModules.
...
* Edits to the "Angular Modules (NgModule)" page (ngmodule.jade). In order to fix some broken links, I defined their destinations in forms.jade and pipes.jade.
* Changed "Angular module" to "NgModule" and other edits.
- I assumed that the “Angular Module FAQs” cookbook page should change to “NgModule FAQs”, so I updated that page as well.
- I updated the name in page headers, TOC titles, and links on the Docs Home page (index.html).
- I noticed the Advanced and Cookbook sections are organized alphabetically, so I reordered the pages and references to reflect that.
2017-03-01 09:55:05 -08:00
Zhicheng Wang
6af595d7bd
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/_includes/_hero-home.jade
# public/_includes/_scripts-include.jade
# public/docs/dart/latest/_data.json
# public/docs/ts/latest/_data.json
# 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/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/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/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/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/user-input.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/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/presskit.jade
# public/resources/js/directives/cheatsheet.js
2017-02-26 15:39:42 +08:00
Kapunahele Wong
894ff63d36
docs(testing): tech edits ( #3269 )
2017-02-20 15:29:42 -08:00
Ward Bell
b2f4148472
chore(quickstart): restore app.module and main ( #3166 )
...
We seemed to create more confusion by omitting app.module (and main) in QS than we gained in simplicity of QS
Every other example requires these files.
This PR restores them to QS _but doesn't talk about them_ in QS, leaving _that_ to the Setup guide.
2017-02-06 18:35:49 -08:00
Kapunahele Wong
452c16dce2
docs(reactive-forms): add reactive forms guide ( #2835 )
2017-01-31 17:36:32 -08:00
Theo Meneau
8728e4963c
docs(deployment): fix broken deployment nav link and ordering ( #3156 )
2017-01-30 13:59:02 +00:00
Filipe Silva
8a537b1225
feat(deployment): add deployment chapter ( #3043 )
...
This PR adds the Deployment Chapter.
2017-01-27 00:40:10 +00:00
Jesús Rodríguez
7a4cfa0630
chore: few leftovers from Angular brand rename ( #3148 )
2017-01-26 18:15:30 +01:00
Ward Bell
de4903be56
chore: Angular 1 -> AngularJS / Angular 2 -> Angular ( #3143 )
...
* chore: Angular 1 -> AngularJS / Angular 2 -> Angular
* Jesus' tweaks
2017-01-26 12:26:11 +01:00
Patrice Chalin
4a0c3d79b7
docs(api/cheatsheet): show ng version + lang in page header ( #2918 )
2016-12-01 19:47:58 +00:00
Yang Lin
625ce82a6c
Fix all _data.json
2016-12-01 10:54:43 +08:00
Yang Lin
4ca4a0a9f6
Polish style-guild.jade
2016-11-29 19:02:21 +08:00
rexebin
b01dc2c2f0
fix: menu
2016-11-27 18:22:27 +00:00
rexebin
afc17dce11
快速开始 -> 快速起步
2016-11-27 10:41:55 +00:00
rexebin
26100f95f6
搭建 -> 搭建本地开发环境
2016-11-27 10:38:15 +00:00
rexebin
0945f5ddce
translate: guide/_data.json
2016-11-27 10:28:32 +00:00
rexebin
d3b8683c3d
Merge remote-tracking branch 'angular.io/master' into merge-26-11-16
...
# Conflicts:
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_next-item.jade
# public/_includes/_version-dropdown.jade
# public/docs/index.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/_quickstart_repo.jade
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/dynamic-form.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/browser-support.jade
# public/docs/ts/latest/guide/change-log.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/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/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/guide/testing.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/guide/user-input.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-pt3.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
# public/events.jade
2016-11-26 21:53:28 +00:00
rexebin
edda524d0d
Merge remote-tracking branch 'angular.io/master'
...
# Conflicts:
# .travis.yml
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_next-item.jade
# public/_includes/_util-fns.jade
# public/_includes/_version-dropdown.jade
# public/docs/_examples/package.json
# public/docs/_examples/quickstart/dart/lib/app_component.dart
# public/docs/_examples/quickstart/e2e-spec.ts
# public/docs/_examples/quickstart/js/app/app.component.js
# public/docs/_examples/quickstart/ts/app/app.component.ts
# public/docs/_examples/quickstart/ts/index.html
# public/docs/_examples/toh-5/dart/lib/dashboard_component.html
# public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
# public/docs/dart/latest/_util-fns.jade
# public/docs/dart/latest/guide/_data.json
# public/docs/dart/latest/guide/index.jade
# public/docs/dart/latest/quickstart.jade
# public/docs/index.jade
# public/docs/js/latest/quickstart.jade
# public/docs/ts/_cache/glossary.jade
# public/docs/ts/_cache/guide/dependency-injection.jade
# public/docs/ts/_cache/guide/index.jade
# public/docs/ts/_cache/quickstart.jade
# public/docs/ts/_cache/tutorial/toh-pt5.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/_quickstart_repo.jade
# public/docs/ts/latest/cli-quickstart.jade
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/dynamic-form.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/browser-support.jade
# public/docs/ts/latest/guide/change-log.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/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/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/guide/testing.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/guide/user-input.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-pt3.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
# public/events.jade
# public/resources/images/devguide/quickstart/hello-angular.png
# scripts/cache.sh
# tools/plunker-builder/indexHtmlTranslator.js
2016-11-26 21:43:16 +00:00
Ward Bell
ec2e6cb2c7
[WIP] docs(quickstart): QuickStart reboot ( #2762 )
2016-11-21 17:36:16 -08:00
Ward Bell
a7525721c0
Revert "[WIP] docs(quickstart): QuickStart reboot ( #2762 )"
...
This reverts commit 8ccc33e6ff
2016-11-21 17:29:00 -08:00
Ward Bell
8ccc33e6ff
[WIP] docs(quickstart): QuickStart reboot ( #2762 )
2016-11-21 17:13:21 -08:00
Ward Bell
c28b003a3c
docs(HTTP Client): edit copy to conform to G-doc guidelines. ( #2630 )
2016-10-19 23:17:50 -07:00
Zhicheng Wang
Filipe Silva
Zhicheng Wang
Ward Bell
Kapunahele Wong
cfranger
Theo Meneau
Jesús Rodríguez
Patrice Chalin
Yang Lin
rexebin