89060a39df
fix: 不正常的中英文段落合并
2018-02-28 13:44:53 +08:00
c08a3830df
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.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/change-log.md
# aio/content/guide/component-styles.md
# aio/content/guide/deployment.md
# aio/content/guide/forms.md
# aio/content/guide/glossary.md
# aio/content/guide/http.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule.md
# aio/content/guide/pipes.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/router.md
# aio/content/guide/security.md
# aio/content/guide/set-document-title.md
# aio/content/guide/setup-systemjs-anatomy.md
# aio/content/guide/setup.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/upgrade.md
# aio/content/marketing/docs.md
# aio/content/marketing/features.html
# aio/content/marketing/resources.json
# aio/content/navigation.json
# aio/src/app/layout/doc-viewer/doc-viewer.component.ts
2018-02-28 13:13:29 +08:00
1531b0610d
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/attribute-directives.md
# aio/content/guide/bootstrapping.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.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/form-validation.md
# aio/content/guide/forms.md
# aio/content/guide/glossary.md
# aio/content/guide/http.md
# aio/content/guide/i18n.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule.md
# aio/content/guide/npm-packages.md
# aio/content/guide/pipes.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/structural-directives.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing.md
# aio/content/marketing/index.html
# aio/content/navigation.json
# aio/content/tutorial/index.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/src/app/embedded/api/api-list.component.ts
# aio/src/app/layout/doc-viewer/doc-viewer.component.ts
# aio/src/app/layout/footer/footer.component.html
# aio/src/app/layout/toc/toc.component.html
# aio/src/app/search/search.service.ts
# aio/src/styles/1-layouts/_marketing-layout.scss
# aio/yarn.lock
2018-02-28 08:08:59 +08:00
1a75934cc0
build(aio): migrate plunker to stackblitz ( #20165 )
...
PR Close #20165
2018-01-23 21:30:27 -08:00
53f91189a1
docs(aio): add NgModule docs ( #20306 )
...
PR Close #20306
2018-01-10 16:26:46 -08:00
1adbcda12e
docs(aio): fix wrong copy ( #20431 )
...
PR Close #20431
2017-11-14 15:58:25 -08:00
9f2738b5c2
fix: 增补翻译
2017-10-22 11:19:24 +08:00
e6e2e2da05
fix: 文字微调
2017-10-12 17:51:55 +08:00
dfde690718
微调
2017-10-01 13:41:29 +08:00
d7fd581c37
Merge branch 'master' into aio
...
# Conflicts:
# aio/content/guide/ajs-quick-reference.md
# aio/content/guide/animations.md
# aio/content/guide/browser-support.md
# aio/content/guide/form-validation.md
# aio/content/guide/i18n.md
# aio/content/guide/pipes.md
# aio/content/guide/router.md
# aio/content/guide/set-document-title.md
# aio/content/guide/structural-directives.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing.md
# aio/content/marketing/resources.json
# 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
2017-10-01 13:22:33 +08:00
11ef4f9cd4
Fixed some typos
...
1.它/她 => 他/她 or other better expression.
2.some of 英雄.+它们 => 英雄.+他们
3.some of 它们.+他们 => 他们.+英雄
2017-09-20 08:40:20 +08:00
53be85a7fb
docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects ( #18197 )
...
PR Close #18197
2017-09-05 15:32:49 -05:00
28eb918651
spelling mistake
...
树组=>数组
2017-08-21 21:33:16 +08:00
c628ef0240
translate mistake
...
english part: The `:id` in the second route
current translation: 第一个路由中的:id
2017-08-21 21:32:48 +08:00
5401322110
fix: 修正在线例子的链接
2017-08-07 08:10:17 +08:00
3a584ba96c
fix: some untranslated english
2017-08-06 13:21:34 +08:00
5834211133
fix: a minor mistake ( #235 )
2017-08-05 18:02:40 +08:00
b0d988c38f
fix: translated the rest of router and structural-directives
2017-08-05 09:41:33 +08:00
0ddf72745e
fix: translate all pure english titles
2017-08-04 14:06:15 +08:00
75ac1cd5ce
fix: add line break before `<code-example...`
2017-08-04 07:39:15 +08:00
828528dade
fix: "覆盖" -> "涵盖"
2017-07-30 12:43:20 +08:00
c002fddabe
fix: many of broken links
2017-07-30 12:32:56 +08:00
f2059b445c
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.md
# aio/content/guide/attribute-directives.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/cb-index.md
# aio/content/guide/change-log.md
# aio/content/guide/cheatsheet.md
# aio/content/guide/cli-quickstart.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.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/dynamic-component-loader.md
# aio/content/guide/dynamic-form.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/index.md
# aio/content/guide/learning-angular.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule.md
# aio/content/guide/npm-packages.md
# aio/content/guide/pipes.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/router.md
# aio/content/guide/security.md
# aio/content/guide/server-communication.md
# aio/content/guide/set-document-title.md
# aio/content/guide/setup-systemjs-anatomy.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.md
# aio/content/guide/ts-to-js.md
# aio/content/guide/typescript-configuration.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/navigation.json
# aio/content/tutorial/index.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/package.json
# aio/src/styles/main.scss
# aio/transforms/angular.io-package/index.js
2017-07-30 00:09:50 +08:00
416ed691e5
docs(aio): fix URLSearchParams interface link to MDN
...
Fixes #18367
2017-07-28 15:26:04 -07:00
20a55c54ed
docs(aio): merge latest chinese translations
2017-07-23 11:51:25 +08:00
9208f0beea
docs(aio): fix typo in Router documentation
...
Fix title and link to RouteConfigLoadEnd documentation
2017-07-19 15:01:50 +01:00
e110a80caf
docs(aio): change Angular Module to NgModule ( #16964 )
2017-07-11 15:05:20 -07:00
8d01db4638
docs: Updated router guide content and examples for paramMap
...
and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.
2017-06-29 09:35:39 -07:00
8c129d73b8
docs: Fix some non-code being formatted as code in the router docs
2017-06-22 14:38:55 -07:00
cd5bc64658
docs(aio): update headers for toc ( #16969 )
2017-05-26 13:28:06 -06:00
b016984c04
docs(aio): resize images
2017-05-12 14:28:09 +01:00
56833a6171
docs(aio): more content fixes
2017-05-10 12:51:01 +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
03610526e5
docs(aio): remove hardcoded TOC
2017-05-04 15:51:37 -07: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
ff32c53099
docs(aio): fix lots of broken links
...
Closes #16317
2017-05-01 15:51:26 -07:00
6561d46349
refactor(aio): move content-related images to `content/images/`
2017-04-27 10:14:32 +01:00
249cd8c2ec
docs(aio): remove _blank target ( #16205 )
2017-04-24 11:23:45 -07: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
c9983e6440
docs(aio): Fix reference to the right example
...
Fix reference to the right example (it's the second route in the example the one showing the route parameter, not the first one)
2017-04-19 11:56:17 +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
46f8a6dd85
docs(aio): remove unnecessary blank lines
2017-03-31 16:22:08 +01:00
2d14c3b17a
docs(aio): ensure blank lines before HTML blocks in markdown
2017-03-31 08:05:33 +01:00
fd72fad8fd
docs(aio): update migrated content from anguar.io
2017-03-28 10:21:46 +01:00
ab40fcb068
docs(aio): fix relative links
...
The migrator was updated to automatically fix these links.
See fca5fb02803927b7a038
2017-03-13 16:56:23 -07:00
1847550ad1
docs(aio): move cookbooks into guide
...
Also update all docs with migrated versions from latest angular.io
Fixes #14941
2017-03-13 16:56:23 -07:00
Zhicheng Wang
Jesus Rodriguez
Kapunahele Wong
Leo Globerman
KingMario
Brandon Roberts
lin
Zhicheng Wang
Antoine Mary
Nicola Sanitate
Mark Amery
Pete Bacon Darwin
Georgios Kalpakas
Ward Bell
Santi