deeeaa9647
docs: 修正坏链
2018-10-22 18:47:41 +08:00
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
bbf96db2f2
feat(docs-infra): add v6 to the aio version picker
2018-10-18 12:38:29 -07:00
7634c1cb31
docs: fix links to browserlist ( #26531 )
...
PR Close #26531
2018-10-18 12:00:38 -07:00
95914a0fbf
docs: update http to https where possible ( #26509 )
...
PR Close #26509
2018-10-18 11:57:57 -07:00
9c50891d6e
docs: update links to Karma homepage ( #26509 )
...
PR Close #26509
2018-10-18 11:57:57 -07:00
624433c51d
docs: removing errant double-quote ( #26483 )
...
PR Close #26483
2018-10-18 11:57:27 -07:00
09cc458bfc
docs: type fix ( #26386 )
...
according to the source code and the doc https://angular.io/api/forms/NgModel#inherited-from-formsngcontrol-1 , the method name should be "viewToModelUpdate" instead of "viewToModel"
PR Close #26386
2018-10-18 11:56:51 -07:00
d9d226087c
build(docs-infra): allow `""` as empty region in `{@example}` tags ( #26514 )
...
PR Close #26514
2018-10-18 09:54:17 -07:00
7bad1d356d
build(docs-infra): only render code example content in one place ( #26514 )
...
PR Close #26514
2018-10-18 09:54:17 -07:00
0add00a743
build(docs-infra): throw error if using `title` on code snippets ( #26514 )
...
Since #26396 , the `title` property is ignored and `header` should be
used instead for specifying a code snippet's header.
This commit ensures that we don't accidentally set `title` have it be
silently ignored.
PR Close #26514
2018-10-18 09:54:17 -07:00
d557f1d9de
build(docs-infra): update git ref for cli command docs ( #26545 )
...
This is to get the latest changes done in https://github.com/angular/angular-cli/pull/12634
PR Close #26545
2018-10-18 09:54:00 -07:00
665627e254
fix(aio): add relative to app level routes section ( #26504 )
...
Added word *relative* to the **Routes at the app level** section description. This was not specified before. The routes in the *lazy-loading-ngmodules/src/app/app-routing.module.ts* also had `loadChildren` values starting with `app/...`.
The code for `app-routing.module.ts` is already fixed in [this commit](67ad9468d3Close #26504
2018-10-17 13:11:42 -07:00
65b209359a
build(docs-infra): update git ref for cli command docs ( #26497 )
...
Update for version 7 release
PR Close #26497
2018-10-17 11:24:19 -07:00
3a65c9ad4e
docs: Update link to angular-cli repo ( #26497 )
...
PR Close #26497
2018-10-17 11:24:19 -07:00
77e58c6179
docs: update contributing page ( #26497 )
...
PR Close #26497
2018-10-17 11:24:19 -07:00
23d625172a
docs: update continuous integration story ( #26497 )
...
PR Close #26497
2018-10-17 11:24:19 -07:00
c3643615fc
docs: replace `alert-is-helpful` with `alert is-helpful` ( #26497 )
...
PR Close #26497
2018-10-17 11:24:19 -07:00
638aaecc7d
docs: add missing backticks ( #26497 )
...
PR Close #26497
2018-10-17 11:24:19 -07:00
5a79decba4
docs: remove for example code ( #26519 )
...
PR Close #26519
2018-10-17 11:23:50 -07:00
225162aa6c
docs: edit file structure guide ( #26256 )
...
PR Close #26256
2018-10-17 11:08:37 -07:00
beebf7fe14
docs: change links to cli wiki to link to new aio docs ( #26489 )
...
PR Close #26489
2018-10-17 11:06:34 -07:00
0ef1f7ef0d
docs: change links to cli wiki to link to new aio docs files m to z ( #26492 )
...
PR Close #26492
2018-10-17 11:06:07 -07: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
ecd473bbce
fix(docs-infra): don't hide contributor links on devices that cannot hover ( #26410 )
...
Fixes #16690
PR Close #26410
2018-10-17 11:04:35 -07:00
3fa876c5e7
fix(docs-infra): fix top menu logo position ( #26473 )
...
Fixes #26468
PR Close #26473
2018-10-17 11:03:23 -07:00
516515d9e3
build(docs-infra): do not add extra space after links in tables ( #26505 )
...
Closes #26487
PR Close #26505
2018-10-17 11:02:56 -07:00
948f507ba0
docs(forms): change headings ( #25900 )
...
Update heading level so it will appear in the TOC.
PR Close #25900
2018-10-16 20:39:45 -07:00
81a8ee1ddb
docs(forms): change headings ( #25900 )
...
Remove "Form" sub-heading & move intro to template-driven form heading.
PR Close #25900
2018-10-16 20:39:45 -07:00
5e58da14f0
docs(forms): change headings ( #25900 )
...
Change the headings of the template-driven forms guide page.
This makes the first heading consistent with other guide pages and the menu label reducing confusion to users browsing the guide.
PR Close #25900
2018-10-16 20:39:45 -07:00
81c9720acb
docs: fix links to setup and cli docs ( #26463 )
...
PR Close #26463
2018-10-16 14:14:19 -07:00
ea2cfbbd2e
docs: remove setup for local dev and anatomy of setup docs from nav ( #26380 )
...
PR Close #26380
2018-10-16 14:14:00 -07:00
41de0e0d98
docs: overview for cli reference section ( #26043 )
...
PR Close #26043
2018-10-16 14:11:26 -07:00
f6a2dbf4f5
docs: updated text to match the Getting started guide ( #26421 )
...
PR Close #26421
2018-10-16 14:11:12 -07:00
327c614799
test(docs-infra): improve logging output in `test-pwa-score[-localhost]` ( #26459 )
...
PR Close #26459
2018-10-15 15:23:36 -07:00
1aa8cfbf74
build(docs-infra): upgrade lighthouse to 3.2.1 ( #26459 )
...
PR Close #26459
2018-10-15 15:23:36 -07:00
95d0626a1e
ci(docs-infra): reduce flakyness ( #26459 )
...
PR Close #26459
2018-10-15 15:23:36 -07:00
5183bbffbe
docs: update process for cli tool and restructure doc ( #25752 )
...
PR Close #25752
2018-10-15 11:22:18 -07:00
9afc9a7464
docs: minor wording correction. "use" to "user". ( #26452 )
...
PR Close #26452
2018-10-15 11:19:46 -07:00
b2db32b715
docs: getting started updated for accuracy and style ( #26093 )
...
PR Close #26093
2018-10-12 14:16:02 -07:00
9e32dc7c95
build: upgrade `@types/jasminewd2` to 2.0.4 ( #26139 )
...
This commit also removes the extra jasminewd2 typings, since the changes
have been merged in the official typings with
DefinitelyTyped/DefinitelyTyped#28957.
PR Close #26139
2018-10-12 14:11:11 -07:00
a19b690338
docs: move cli commands above api in nav ( #26405 )
...
PR Close #26405
2018-10-12 14:09:39 -07:00
bab5b68910
fix(docs-infra): prevent unnecessary SideNav scrollbar ( #26416 )
...
Fixes #21508
PR Close #26416
2018-10-12 14:09:09 -07:00
3daeadd235
docs: visual studio removed from nav and updated to refer to getting started instead of quickstart repo ( #26376 )
...
PR Close #26376
2018-10-12 14:08:11 -07:00
ea20ae63d0
build(docs-infra): only show name in 'inherited from' section ( #26387 )
...
Closes #26181
PR Close #26387
2018-10-12 09:13:02 -07:00
7777a99fe5
fix(docs-infra): highlight current CLI command in navigation menu ( #26388 )
...
Previously CLI was being treated like the API page, where the top level item
had to be highlighted for any command page. But now the CLI commands all
have their own navigation item, which can be selected, so there is no need
to special case CLI paths any more.
Closes #26373
PR Close #26388
2018-10-12 09:02:11 -07:00
7fbeb04b7c
build(docs-infra): upgrade @angular/material to 7.0.0-rc.1 ( #26394 )
...
PR Close #26394
2018-10-12 08:55:15 -07:00
42ee50fc22
build(docs-infra): upgrade @angular/* to 7.0.0-rc.1 ( #26394 )
...
PR Close #26394
2018-10-12 08:55:15 -07:00
163b7c94a9
build(docs-infra): upgrade @angular/cli to 7.0.0-rc.2 ( #26394 )
...
PR Close #26394
2018-10-12 08:55:15 -07:00
Zhicheng Wang
Igor Minar
Alan
Rob Phoenix
null-reference
lovelangy
George Kalpakas
Siddharth Ajmera
Judy Bogart
jenniferfell
William Marques
Pete Bacon Darwin
Vladimir Erygin
George Wilde
Vani