9a0d3e9633
docs: 手动解决冲突
2018-10-22 18:16:47 +08:00
a9ac90d3df
Merge remote-tracking branch 'en/master' into aio
...
# Conflicts:
# aio/content/guide/ajs-quick-reference.md
# aio/content/guide/animations.md
# aio/content/guide/aot-compiler.md
# aio/content/guide/architecture-components.md
# aio/content/guide/architecture-modules.md
# aio/content/guide/architecture-next-steps.md
# aio/content/guide/architecture-services.md
# aio/content/guide/architecture.md
# aio/content/guide/attribute-directives.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/cheatsheet.md
# aio/content/guide/comparing-observables.md
# aio/content/guide/component-interaction.md
# aio/content/guide/component-styles.md
# aio/content/guide/dependency-injection-in-action.md
# aio/content/guide/dependency-injection-pattern.md
# aio/content/guide/dependency-injection.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/dynamic-component-loader.md
# aio/content/guide/elements.md
# aio/content/guide/feature-modules.md
# aio/content/guide/form-validation.md
# aio/content/guide/forms.md
# aio/content/guide/glossary.md
# aio/content/guide/hierarchical-dependency-injection.md
# aio/content/guide/i18n.md
# aio/content/guide/lazy-loading-ngmodules.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule-vs-jsmodule.md
# aio/content/guide/ngmodules.md
# aio/content/guide/npm-packages.md
# aio/content/guide/observables-in-angular.md
# aio/content/guide/observables.md
# aio/content/guide/pipes.md
# aio/content/guide/practical-observable-usage.md
# aio/content/guide/providers.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/router.md
# aio/content/guide/rx-library.md
# aio/content/guide/security.md
# aio/content/guide/service-worker-communications.md
# aio/content/guide/service-worker-getting-started.md
# aio/content/guide/service-worker-intro.md
# aio/content/guide/setup-systemjs-anatomy.md
# aio/content/guide/setup.md
# aio/content/guide/singleton-services.md
# aio/content/guide/structural-directives.md
# aio/content/guide/styleguide.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/universal.md
# aio/content/guide/updating.md
# aio/content/guide/upgrade.md
# aio/content/guide/user-input.md
# aio/content/guide/visual-studio-2015.md
# aio/content/marketing/docs.md
# aio/content/navigation.json
# aio/content/tutorial/toh-pt0.md
# aio/content/tutorial/toh-pt1.md
# aio/content/tutorial/toh-pt2.md
# aio/content/tutorial/toh-pt3.md
# aio/content/tutorial/toh-pt4.md
# aio/content/tutorial/toh-pt5.md
# aio/content/tutorial/toh-pt6.md
# aio/ngsw-manifest.json
# aio/package.json
# aio/src/app/custom-elements/api/api-list.component.html
# aio/src/app/custom-elements/api/api-list.component.ts
# aio/src/index.html
# aio/tools/transforms/templates/api/base.template.html
# aio/tools/transforms/templates/api/class.template.html
# aio/tools/transforms/templates/api/directive.template.html
# aio/tools/transforms/templates/api/enum.template.html
# aio/tools/transforms/templates/api/includes/class-overview.html
# aio/tools/transforms/templates/api/includes/deprecation.html
# aio/tools/transforms/templates/api/includes/export-as.html
# aio/tools/transforms/templates/api/includes/info-bar.html
# aio/tools/transforms/templates/api/includes/interface-overview.html
# aio/tools/transforms/templates/api/includes/selectors.html
# aio/tools/transforms/templates/api/lib/directiveHelpers.html
# aio/tools/transforms/templates/api/lib/githubLinks.html
# aio/tools/transforms/templates/api/lib/memberHelpers.html
# aio/tools/transforms/templates/api/package.template.html
# aio/yarn.lock
# packages/common/http/src/module.ts
# packages/common/src/common_module.ts
# packages/common/src/directives/ng_for_of.ts
# packages/common/src/directives/ng_if.ts
# packages/common/src/directives/ng_template_outlet.ts
# packages/common/src/location/location.ts
# packages/common/src/pipes/async_pipe.ts
# packages/common/src/pipes/json_pipe.ts
# packages/common/src/pipes/number_pipe.ts
# packages/common/src/pipes/slice_pipe.ts
# packages/core/src/change_detection/change_detector_ref.ts
# packages/core/src/di/injectable.ts
# packages/core/src/linker/template_ref.ts
# packages/core/src/linker/view_container_ref.ts
# packages/core/src/metadata/di.ts
# packages/core/src/metadata/ng_module.ts
# packages/core/src/render/api.ts
# packages/forms/src/directives/form_interface.ts
# packages/forms/src/directives/ng_form.ts
# packages/forms/src/directives/ng_model.ts
# packages/forms/src/directives/reactive_directives/form_control_name.ts
# packages/forms/src/directives/select_control_value_accessor.ts
# packages/forms/src/directives/validators.ts
# packages/forms/src/form_providers.ts
# packages/forms/src/model.ts
# packages/forms/src/validators.ts
# packages/router/src/config.ts
# packages/router/src/router.ts
# packages/router/src/router_module.ts
# packages/router/src/router_state.ts
2018-10-21 17:43:29 +08:00
fc6dad40ac
fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips ( #26396 )
...
Closes #26174
PR Close #26396
2018-10-17 11:05:29 -07:00
8e71ad6027
docs: typo on function name for handleError() ( #26261 )
...
changed function name `errorHandle()` to `handleError()`
PR Close #26261
2018-10-09 16:54:15 -07:00
c7e2930f25
docs: fix issues related to tutorial. ( #24445 )
...
PR Close #24445
2018-09-25 18:45:19 -07:00
cc55d609ce
docs: add HttpClientModule import code to services tutorial ( #24854 )
...
To be able to copy and paste.
PR Close #24854
2018-08-16 13:51:18 -07:00
6861bc5b06
docs: clarify heroes example ( #21216 )
...
PR Close #21216
2018-08-06 13:44:17 -07:00
1dd2eaa7d2
docs: fix typos and missing word in tutorial ( #20764 )
...
PR Close #20764
2018-08-01 10:56:31 -07:00
a1b185b723
docs: Change unnecessary step in ToH-Tutorial ( #25059 )
...
PR Close #25059
2018-07-27 09:25:59 -07:00
2d485c6589
Merge remote-tracking branch 'en/master' into aio
...
# Conflicts:
# aio/content/guide/animations.md
# aio/content/guide/aot-compiler.md
# aio/content/guide/api-page-class.md
# aio/content/guide/architecture-components.md
# aio/content/guide/architecture-modules.md
# aio/content/guide/architecture-services.md
# aio/content/guide/architecture.md
# aio/content/guide/attribute-directives.md
# aio/content/guide/browser-support.md
# aio/content/guide/component-interaction.md
# aio/content/guide/component-styles.md
# aio/content/guide/dependency-injection-in-action.md
# aio/content/guide/dependency-injection-pattern.md
# aio/content/guide/dependency-injection.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/elements.md
# aio/content/guide/form-validation.md
# aio/content/guide/forms.md
# aio/content/guide/frequent-ngmodules.md
# aio/content/guide/glossary.md
# aio/content/guide/hierarchical-dependency-injection.md
# aio/content/guide/http.md
# aio/content/guide/i18n.md
# aio/content/guide/language-service.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-api.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/npm-packages.md
# aio/content/guide/observables.md
# aio/content/guide/pipes.md
# aio/content/guide/providers.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/releases.md
# aio/content/guide/router.md
# aio/content/guide/rx-library.md
# aio/content/guide/security.md
# aio/content/guide/service-worker-config.md
# aio/content/guide/service-worker-getting-started.md
# aio/content/guide/set-document-title.md
# aio/content/guide/setup.md
# aio/content/guide/structural-directives.md
# aio/content/guide/styleguide.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing-observables.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/universal.md
# aio/content/guide/upgrade.md
# aio/content/guide/user-input.md
# aio/content/guide/visual-studio-2015.md
# aio/content/guide/webpack.md
# aio/content/marketing/resources.json
# aio/content/navigation.json
# aio/content/tutorial/toh-pt0.md
# aio/content/tutorial/toh-pt1.md
# aio/content/tutorial/toh-pt4.md
# aio/content/tutorial/toh-pt5.md
# aio/content/tutorial/toh-pt6.md
# aio/src/app/custom-elements/api/api-list.component.ts
# aio/src/app/custom-elements/live-example/live-example.component.html
# aio/src/app/custom-elements/live-example/live-example.component.ts
# aio/src/app/layout/doc-viewer/doc-viewer.component.ts
# aio/src/styles/main.scss
# aio/tools/transforms/remark-package/services/renderMarkdown.js
2018-07-27 10:51:18 +08:00
d523630ea2
docs(aio): cleanup aalert, callout, subsection use and author style ( #24986 )
...
PR Close #24986
2018-07-24 08:22:14 -07:00
2867ceecdb
fix: sync to 6.0(WIP)
2018-05-15 13:32:40 +08:00
f958293205
docs(aio): update text InMemoryWebApiModule to HttpClientInMemoryWebApiModule ( #23285 )
...
PR Close #23285
2018-04-12 23:17:19 -07:00
9f7bd8f618
docs: update text around changed obs examples ( #22920 )
...
PR Close #22920
2018-03-29 09:20:04 -07:00
e167fa5229
refactor: 重构自动翻译代码
2018-03-24 20:03:10 +08:00
6c3d57aee9
fix: 合并了最新版本
2018-03-24 13:12:42 +08:00
c20a841249
fix: 部分 更新 替换成 修改
2018-03-23 09:48:55 +08:00
545d4b6c69
feat: 自动在中英文之间添加空格，以改善排版
2018-03-20 17:09:18 +08:00
e0fc873240
fix: minor fix and auto translate based on previous result
2018-03-18 07:44:33 +08:00
0c420c2efc
fix: 纠正错误及翻译遗漏的部分
2018-03-12 13:04:48 +08:00
636c072823
fix: 教程中的“我们”改成了“你”
2018-03-09 13:30:42 +08:00
ead2165315
fix: 翻译了 toh-pt6
2018-03-09 13:17:13 +08:00
b7ceb9e211
fix: 修正了死链接
2018-03-07 16:48:44 +08:00
964266f4b0
fix: 合并第一版的翻译
2018-03-07 15:42:49 +08:00
fc58e0eee0
fix: 合并第二版的翻译
2018-03-07 14:54:27 +08:00
9adeb14f3a
fix: 人工修订自动翻译
2018-03-07 12:26:05 +08:00
0e0ffa481e
fix: 修正自动翻译结果
2018-03-07 11:25:56 +08:00
206f6ecc4f
fix: 修正最后一版的全部翻译
2018-03-04 09:07:33 +08:00
c593d69ce7
docs(aio): fix doc typo referring to `httpOptions` ( #22456 )
...
The variable name mention should match the actual tutorial code.
PR Close #22456
2018-02-26 13:32:44 -08:00
3aa7e0228a
docs(aio): fix swap value ( #20905 )
...
'http.get' has been swapped in for 'of'
PR Close #20905
2018-02-05 13:05:58 -08:00
c28b52187a
docs(aio): add missing closing backtick ( #20446 )
...
PR Close #20446
2017-11-15 18:25:49 -06:00
049c89645b
docs(aio): update ToH for CLI ( #19811 )
2017-11-06 10:02:17 -08:00
8d8995f1ab
docs(aio): edit summary and next step headers ( #16962 )
2017-09-27 13:45:47 -07:00
c6cf678a07
docs(aio): Fixed typo with closing div
2017-07-20 09:38:28 -07:00
f054c8360b
docs(aio): fix up broken links
2017-07-18 11:45:05 +01:00
e110a80caf
docs(aio): change Angular Module to NgModule ( #16964 )
2017-07-11 15:05:20 -07:00
56ccd5e6a1
docs(aio): remove excess h1s from guides
...
Only one h1 is allowed per document.
(Also took the opportunity to remove unnecessary blank lines from these
docs, and a bit of general tidying.)
Closes #16193
2017-05-11 08:15:19 +01:00
9e661e58d1
docs(aio): image sweep ( #16609 )
...
* fix(aio): allow code blocks to clear floated images
Previously the negative margin on the code headings were causing
floated images to overlay the start of a code block. Now all code block
successfully clear all floated elements.
* feat(aio): add a `.clear` class for clearing floating images
* fix(aio): tidy up image styles
The css rules for `img.right` and `img.left` allow authors easy
access to floating an image on the left or right, respectively.
The `.image-display` rule which was always found on a figure
has been simplified so that all figures have this styling. It is very
unlikely that a figure will be used outside the content area; and
at this time it seems like `figure` is as good an indicator that we
want this kind of styling as anything.
Now that images are all tagged with width and height values, we cannot
assume to modify these dimensions via CSS as it can cause the image to
lose its correct proportions. Until we find a better solition we must set
`height` to `auto` when the screen width is below 1300px to ensure that
these images maintain their proportions as they get shrunk to fit.
* docs(aio): general tidy up of image HTML in guides
Previously, the guides have a lot of inline image styling and unnecessary
use of the `image-display` css class.
Images over 700px are problematic for guide docs, so those have been given
specific widths and associated heights.
* docs(aio): use correct anchor for "back to the top" link
The `#toc` anchor does not work when the page is
wide enough that the TOC is floating to the side.
* build(aio): add `#top-of-page` to path variants for link checking
Since the `#top-of-page` is outside the rendered docs
the `checkAnchorLinks` processor doesn't find them
as valid targets for links.
Adding them as a `pathVariant` solves this problem
but will still catch links to docs that do not actually exist.
* fix(aio): ensure that headings clear floated images
* fix(aio): do not force live-example embedded image to 100% size
This made them look too big, generally. Leaving them with no size means
that they will look reasonable in large viewports and switch to 100% width
in narrow viewports.
2017-05-09 15:53:32 -07:00
2714644528
docs(aio): fix broken links discovered May 4th
2017-05-05 11:05:22 +01:00
5b96fb9320
build(aio): rename `src/content` to `src/generated`
...
This commit will definitely require a clean up of your
working folder:
```
cd aio
git clean -xdf
yarn setup
```
2017-05-03 13:40:46 -07:00
9650ff0824
docs(aio): add hero “Zero” to toh-6
...
Update to in-memory-web-api should handle id=0.
Make sure this works by having a hero with id=0 in ToH.
Coincidentally delete lingering dead app/ folders
Todo: fix ToH images (which have to do anyway)
2017-05-03 08:03:55 +01:00
6561d46349
refactor(aio): move content-related images to `content/images/`
2017-04-27 10:14:32 +01:00
bb1850a912
docs(aio): relocate images to match docs
2017-04-24 14:00:51 +01:00
93516ea8a1
docs(aio): rename cb- files and a few others
2017-04-24 14:00:51 +01:00
e07b7ea114
docs(aio): fix broken regions
2017-04-19 15:52:55 +01:00
9d40ab9e20
docs(aio): rename ToH to match the guide name
2017-04-19 10:28:31 +01:00
061475402c
docs(aio): final migration from old site
2017-04-12 21:01:55 +01:00
28c2a71cfc
docs(aio): revert file-trees back to original structure
...
This is an auto-migration from angular.io
2017-04-12 12:24:02 -07:00
df619adc76
docs(aio): update to remark syntax
2017-04-12 12:24:02 -07:00
0e38bf9de0
build(aio): new migration
2017-04-03 15:41:05 -07:00
Zhicheng Wang
William Marques
Wei Lun
Vani
Ana María Martínez Gómez
René Ras
Stephon Harris
Frederik Schlemmer
Stefanie Fluin
Michael Huang
Judy Bogart
Zhicheng Wang
Jamie Krug
A7xSV
Brad Pitcher
Jesús Rodríguez
Kapunahele Wong
matt24ray
Peter Bacon Darwin
Ward Bell
Georgios Kalpakas