honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,151 Commits 5 Branches 1 Tag 210 MiB
Commit Graph

721 Commits

Author SHA1 Message Date
Victor Berchet 27d811a7ce
Revert "docs: update docs to use HttpClientModule instead of HttpModule (#22727)" 
This reverts commit 3ed7fc6686.
 2018-05-30 16:12:49 -07:00
Judy Bogart c25e6142d2 docs: remove unfinished observables file (#23801) 
PR Close #23801
 2018-05-30 14:44:28 -07:00
Aditya Bhardwaj 223882aeb6 docs: fix typo (#24201) 
closes #23853

PR Close #24201
 2018-05-30 11:24:11 -07:00
Aaron Gussman 3ed7fc6686 docs: update docs to use HttpClientModule instead of HttpModule (#22727) 
Updated most examples to use HttpClientModule instead of deprecated HttpModule

fix #19280

PR Close #22727
 2018-05-30 10:03:14 -07:00
cexbrayat 41cd8f3efb refactor(core): use Partial<T> for MetadataOverride (#24103) 
Allows to write:

const fixture = TestBed
      .overridePipe(DisplayNamePipe, { set: { pure: false } })
      .createComponent(MenuComponent);

when you only want to set the `pure` metadata,
instead of currently:

const fixture = TestBed
      .overridePipe(DisplayNamePipe, { set: { name: 'displayName', pure: false } })
      .createComponent(MenuComponent);

which forces you to redefine the name of the pipe even if it is useless.

Fixes #24102

PR Close #24103
 2018-05-29 18:40:05 -04:00
jenniferfell 00c4751f37 docs: update lts and labs practices (#23922) 
PR Close #23922
 2018-05-29 18:01:31 -04:00
Danny Rademacher d74078fb88 docs(http): correct spelling error (#23675) 
Correct a spelling error. I changed HttpParms to HttpParams
PR Close #23675
 2018-05-29 16:55:06 -04:00
Zhicheng Wang b7f7ca8bdf fix: 文字微调 2018-05-26 09:49:01 +08:00
Patrick McDonald 6d8c847e7b docs: fix typo (#23998) 
"Made" doesn't make sense (redoing and closing #23940)
PR Close #23998
 2018-05-22 13:35:13 -04:00
Akihito Tamagawa ea4321d912 docs(aio): fix typo (#23990) 
are are -> are
PR Close #23990
 2018-05-21 16:04:08 -04:00
Zhicheng Wang 8494cf4b25 fix: 翻译微调 2018-05-19 22:22:18 +08:00
NAIVEddd 1b2560cf4e fix: translate error. 2018-05-19 10:55:39 +08:00
NAIVEddd d4fa1d4c61 fix: translate error. 2018-05-19 10:55:39 +08:00
Chris Yu d6e2a8f614 fixed some translation errors and typo 2018-05-19 10:53:47 +08:00
Jerry e1090c1c54 修改翻译错误 
应该显示响应式表单的基础类，而不是CSS类。
 2018-05-19 10:48:34 +08:00
Zhicheng Wang f73b11cfe1 fix: minor text fix 2018-05-18 16:34:19 +08:00
Brandon Roberts 20d76374ed docs(aio): Expose server and CLI configuration for universal in guide (#23842) 
Closes #23795

PR Close #23842
 2018-05-16 17:21:44 -04:00
Suguru Inatomi 547efb5f4d docs(aio): fix path to observables guide (#23858) 
PR Close #23858
 2018-05-16 17:16:48 -04:00
Jonathan Sharpe 091b11a4ab docs(aio): update HTTP error test example (#22844) 
Update the example to match the description preceding it, which refers to the
use of the error method and ErrorEvent rather than the flush method with a
non-2xx status as shown previously.

PR Close #22844
 2018-05-16 17:15:20 -04:00
Zhicheng Wang f5b24bf615 fix: fine-tuning translation 2018-05-16 13:08:17 +08:00
Zhicheng Wang b6a0b06454 fix: translate new chapter "Angular Elements Overview" 2018-05-16 12:59:27 +08:00
Zhicheng Wang f7a6ccbb5d fix: merge code & fix some issues 2018-05-16 08:19:28 +08:00
George Kalpakas 1d378e2987 fix(service-worker): deprecate `versionedFiles` in asset-group resources (#23584) 
Since `versionedFiles` behaves in the exact same way as `files`, there
is no reaason to have both. Users should use `files` instead.

This commit deprecates the property and prints a warning when coming
across an asset-group that uses it. It should be completely removed in
a future version.

Note, it has also been removed from the default `ngsw-config.json`
template in angular/devkit#754.

PR Close #23584
 2018-05-15 12:19:08 -07:00
Zhicheng Wang 8136953a09 Merge branch 'en-master' into aio 
# Conflicts:
#	aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts
#	aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts
#	aio/content/examples/upgrade-module/src/systemjs.config.1.js
#	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/bootstrapping.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.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/docs-style-guide.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables.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/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/styleguide.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/marketing/features.html
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.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/app/documents/document.service.ts
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/shared/toc.service.ts
#	aio/tools/transforms/templates/api/base.template.html
#	aio/yarn.lock
 2018-05-15 23:26:31 +08:00
Zhicheng Wang 7ffc6b03d7 fix: sync to 6.0(Content complete) 2018-05-15 17:28:18 +08:00
Zhicheng Wang a108ac5130 fix: sync to 6.0(WIP) 2018-05-15 14:01:08 +08:00
Zhicheng Wang 2867ceecdb fix: sync to 6.0(WIP) 2018-05-15 13:32:40 +08:00
Zhicheng Wang 4ff1a42339 fix: sync to 6.0(WIP) 2018-05-15 12:33:17 +08:00
Zhicheng Wang 47cc6f7a72 fix: sync to 6.0(WIP) 2018-05-15 10:50:10 +08:00
panakour 8a27a034c4 docs: update version to 6 in language-service (#20795) 
PR Close #20795
 2018-05-11 12:22:51 -04:00
Judy Bogart c4221dad11 docs(elements): add angular element term to glossary (#23807) 
PR Close #23807
 2018-05-10 15:50:00 -07:00
Judy Bogart 72eab4d254 docs(elements): emphasize future direction, update link (#23806) 
PR Close #23806
 2018-05-10 15:46:53 -07:00
Zhicheng Wang fb29977b22 fix: sync to 6.0(WIP) 2018-05-10 14:12:21 +08:00
Zhicheng Wang 5391220474 fix: sync to 6.0(WIP) 2018-05-10 13:55:06 +08:00
Zhicheng Wang 11e0635d0d fix: sync to 6.0(WIP) 2018-05-10 13:53:04 +08:00
Zhicheng Wang f0aff1095a fix: sync to 6.0(WIP) 2018-05-10 13:51:25 +08:00
Zhicheng Wang 43e2c1d4bf fix: sync to 6.0(WIP) 2018-05-10 13:50:05 +08:00
Zhicheng Wang ca4ce359bc fix: sync to 6.0(WIP) 2018-05-10 13:48:22 +08:00
Brandon Roberts d01ec03f54 docs(aio): Upgrade example dependencies to Angular V6 (#23660) 
PR Close #23660
 2018-05-08 13:56:48 -07:00
Brandon Roberts 9e2d87f5b8 docs(aio): Update i18n example to Angular V6 (#23660) 
PR Close #23660
 2018-05-08 13:56:48 -07:00
Zhicheng Wang d1220e0cfa fix: sync to 6.0(lifecycle & ngmodule-faq) 2018-05-08 13:57:47 +08:00
Zhicheng Wang 18eb14ced0 fix: sync to 6.0(DI & http) 2018-05-08 13:45:32 +08:00
Zhicheng Wang 5d573e8001 fix: sync to 6.0(DI & deploy) 2018-05-08 13:32:11 +08:00
Zhicheng Wang efa212ce27 fix: sync to 6.0(DI in action) 2018-05-08 12:27:29 +08:00
Zhicheng Wang 77a2381d0a fix: sync to 6.0(WIP) 2018-05-07 13:06:47 +08:00
Brandon Roberts 2cf6244b1d docs(aio): Upgrade server-side rendering example to Angular V6 (#23649) 
PR Close #23649
 2018-05-02 16:51:03 -07:00
jenniferfell d7ed9c9e9e docs: add new info about angular update policies and resources (#23551) 
PR Close #23551
 2018-05-02 16:26:46 -07:00
Vani d71329d55c docs: add information on when not to use tree-shakable providers (#23634) 
PR Close #23634
 2018-05-02 15:56:34 -07:00
Camilo Giraldo d7e8d15578 docs: add missing link to bootstrapping section (#23214) 
PR Close #23214
 2018-05-02 15:53:00 -07:00
Vani bfad6b4fa1 docs: add doc to include updates to the index.html with the new ng add command (#23616) 
PR Close #23616
 2018-05-02 15:18:23 -07:00
Brandon Roberts fd9d1888ce build(aio): align stackblitz files with Angular CLI V6 (#23521) 
Also cleans up legacy references to `.angular-cli.json`

PR Close #23521
 2018-05-02 15:00:57 -07:00
Anuj 94fbe3b5ac docs(forms): Fixed a typo in the reactive form (From 'address' to 'secretLairs') section (#23221) 
PR Close #23221
 2018-05-02 15:00:27 -07:00
Andrew Seguin 56828e43b6 docs(elements): add intro connecting angular elements to custom elements (#23638) 
PR Close #23638
 2018-05-02 14:57:20 -07:00
George Kalpakas ca1019a950 docs: fix typo in tag name (`my-child` --> `app-child`) (#23606) 
Fixes #23599

PR Close #23606
 2018-05-01 10:26:50 -07:00
Bennett Hardwick cc6c4346c2 docs(aio): update docs error in guide/http (#23567) 
Updates documentation to include examples for both req.flush and
req.error in http testing examples.

PR Close #23567
 2018-04-27 07:24:17 -07:00
Judy Bogart a522bb9f03 docs: correct more typos (#23565) 
PR Close #23565
 2018-04-27 07:19:14 -07:00
Judy Bogart 31b96e99ff docs: correct typos (#23565) 
PR Close #23565
 2018-04-27 07:19:14 -07:00
Judy Bogart b7a6e1fef7 docs: correct node.js version and usage (#23565) 
PR Close #23565
 2018-04-27 07:19:14 -07:00
Judy Bogart f567e1898f docs: update glossary architectural terms (#23045) 
PR Close #23045
 2018-04-25 13:21:52 -07:00
Noah Medling 8d0ee34939
docs: corrected spelling of "ambient". 2018-04-24 15:04:50 -07:00
Brandon Roberts 2278fe8f0e docs(aio): Upgrade examples to Angular 6 (#23234) 
PR Close #23234
 2018-04-17 14:09:02 -07:00
Anuj 010a4efa8c docs(aio): Fixed typo in 'comparing observables -> Observabled compared (#23407) 
to arrays' section.

PR Close #23407
 2018-04-17 13:43:45 -07:00
Vani 9c29127723 docs: document how to enable service worker using ng add command (#23348) 
PR Close #23348
 2018-04-16 08:57:13 -07:00
Tiep Phan fd1c39ce42 docs: update lifecycle hooks section in cheatsheet (#23320) 
PR Close #23320
 2018-04-15 23:44:44 -07:00
systemallica 896811df64 docs(aio): add missing word in the Component metadata section (#23384) 
PR Close #23384
 2018-04-15 23:36:55 -07:00
Brandon Roberts 490772e680 docs(aio): Update file tree to match Angular CLI V6 structure (#23367) 
PR Close #23367
 2018-04-13 14:19:16 -07:00
George Kalpakas 08325aaffc feat(service-worker): add support for configuring navigations URLs (#23339) 
The ServiceWorker will redirect navigation requests that don't match any
`asset` or `data` group to the specified index file. The rules for a
request to be classified as a navigation request are as follows:
1. Its `mode` must be `navigation`.
2. It must accept a `text/html` response.
3. Its URL must match certain criteria (see below).

By default, a navigation request can have any URL except for:
1. URLs containing `__`.
2. URLs to files (i.e. containing a file extension in the last path
   segment).

While these rules are fine in many cases, sometimes it is desirable to
configure different rules for the URLs of navigation requests (e.g.
ignore specific URLs and pass them through to the server).

This commit adds support for specifying an optional `navigationUrls`
list in `ngsw-config.json`, which contains URLs or simple globs
(currently only recognizing `!`, `*` and `**`).
Only requests whose URLs match any of the positive URLs/patterns and
none of the negative ones (i.e. URLs/patterns starting with `!`) will be
considered navigation requests (and handled accordingly by the SW).

(This is an alternative implementation to #23025.)

Fixes #20404

PR Close #23339
 2018-04-13 13:13:36 -07:00
George Kalpakas d1e716b2cb docs(service-worker): minor fixes/improvements (#23339) 
PR Close #23339
 2018-04-13 13:13:36 -07:00
Rob Wormald 74b203a55e docs(elements): add ng-add docs to elements guide (#23350) 
PR Close #23350
 2018-04-13 00:50:04 -07:00
Juan Camilo Giraldo Chaverra 221ae6998a docs(aio): fix typo on AOT compiler section 2018-04-13 00:06:26 -07:00
Rob Wormald eb9968ab2a docs(elements): use Angular Elements naming in nav (#23213) 
PR Close #23213
 2018-04-05 16:32:57 -07:00
George Kalpakas b874501025 docs(aio): update `live-example` docs in authors style guide (#23018) 
PR Close #23018
 2018-04-05 10:12:09 -07:00
Igor Minar 5db9ab12c0
docs: fix skipTemplateCodeGen -> skipTemplateCodegen typo in the AOT compiler guide 2018-04-04 23:12:28 -07:00
Vani 4506230fbb docs: update contents to recommend new way of defining providers (#23076) 
PR Close #23076
 2018-04-03 12:32:59 -07:00
Vani 5671ae6a58 docs: add tree-shakable providers doc (#23027) 
PR Close #23027
 2018-04-03 12:32:39 -07:00
jenniferfell a4bf5621ed docs: add reference to ng add in tutorial and quick reference (#23130) 
PR Close #23130
 2018-04-03 07:38:47 -07:00
Judy Bogart ff34d5ea7a docs: add custom elements documentation (#22966) 
PR Close #22966
 2018-04-02 14:13:46 -07:00
Judy Bogart de0b13d41d docs: update for hero service name change (#22920) 
PR Close #22920
 2018-03-29 09:20:04 -07:00
Judy Bogart 07d33d4e5a docs: fix operator name (#22920) 
PR Close #22920
 2018-03-29 09:20:04 -07:00
Judy Bogart 9f7bd8f618 docs: update text around changed obs examples (#22920) 
PR Close #22920
 2018-03-29 09:20:04 -07:00
Zhicheng Wang 2a2e66034d fix: 查漏补缺 2018-03-28 08:51:22 +08:00
Veres Lajos de90314304 style: typos fixed - https://github.com/vlajos/misspell-fixer (#22975) 
PR Close #22975
 2018-03-27 14:51:53 -04:00
Zhicheng Wang ced3662da9 fix: 微调 2018-03-27 13:00:43 +08:00
Zhicheng Wang b433d2148c fix: change some angular.io to angular.cn 2018-03-26 16:34:57 +08:00
Zhicheng Wang 838f07bdcd fix: 修正错误的标题级别 2018-03-26 14:53:47 +08:00
Zhicheng Wang 7965991c60 feat: 翻译完了 architecture-services 2018-03-25 17:04:24 +08:00
Zhicheng Wang 01ed628717 feat: 翻译完了 architecture-components 和 architecture-modules 2018-03-25 12:36:17 +08:00
Zhicheng Wang b01ec8ad9a feat: 翻译完了 architecture-next-steps 2018-03-25 08:27:31 +08:00
Zhicheng Wang 9e732fc4ff feat: 翻译完了 architecture 2018-03-25 08:01:14 +08:00
Zhicheng Wang e1ca813b7c fix: 翻译完了 reactive-forms 新增的部分 2018-03-24 21:43:09 +08:00
Zhicheng Wang e167fa5229 refactor: 重构自动翻译代码 2018-03-24 20:03:10 +08:00
Zhicheng Wang 6c3d57aee9 fix: 合并了最新版本 2018-03-24 13:12:42 +08:00
Zhicheng Wang a4ac40b640 fix: 翻译了所有遗漏的部分。 2018-03-24 11:16:33 +08:00
Zhicheng Wang 5c39927ee1 fix: 微调 2018-03-24 08:44:35 +08:00
Zhicheng Wang abbc8d84f0 fix: 微调 2018-03-24 08:38:15 +08:00
Zhicheng Wang 0203e84780 fix: 微调 2018-03-24 08:32:25 +08:00
Zhicheng Wang 15691c4e36 fix: 微调 2018-03-24 08:14:29 +08:00
Zhicheng Wang a65ccab7be feat: 翻译完了 Service Worker。 
feat: 本版的翻译全部完工。
 2018-03-24 08:11:01 +08:00
Zhicheng Wang 16aaf4db45 feat: 翻译了一部分 Service Worker 2018-03-23 22:51:40 +08:00
Zhicheng Wang 1e4bddbe26 feat: 翻译了一部分 Service Worker 2018-03-23 17:00:19 +08:00
Zhicheng Wang 494553a567 feat: 翻译完了 AOT Compiler 2018-03-23 14:25:12 +08:00
Zhicheng Wang c20a841249 fix: 部分 更新 替换成 修改 2018-03-23 09:48:55 +08:00
Zhicheng Wang d0292bbe82 fix: 把遗漏的 我们 替换成 你 2018-03-23 09:43:02 +08:00
Zhicheng Wang a523fbdedb fix: upgrade 中的 我们 替换成 你 2018-03-23 09:13:46 +08:00
Zhicheng Wang 886f7da931 fix: 把烹饪书换成烹饪宝典 2018-03-22 17:30:09 +08:00
Zhicheng Wang 2b2b537008 fix: 把中文中的_替换成* 2018-03-22 17:24:05 +08:00
Zhicheng Wang f75baea397 fix: 把除了 upgrading 之外的 我们 都替换成了 你 
fix: 翻译了一部分 AOT Compiler
 2018-03-22 17:19:12 +08:00
Zhicheng Wang 5ff85f455c fix: 翻译 i18n 剩下的部分 2018-03-22 10:55:55 +08:00
Zhicheng Wang 67cb21e6c1 fix: 翻译完了服务端渲染部分 2018-03-22 10:52:52 +08:00
Zhicheng Wang 450474fca1 fix: 修正 i18n 编译错误 2018-03-22 10:52:34 +08:00
Jinhyuk Kim f461f43d72 docs: fix a typo in aot compiler guide (#22876) 
PR Close #22876
 2018-03-21 13:20:51 -07:00
Zhicheng Wang 83e7817ff2 fix: 统一了 JIT 和 AOT 的写法 2018-03-21 16:23:00 +08:00
Zhicheng Wang b54ce4847d feat: 翻译完了 i18n 部分 2018-03-21 16:21:28 +08:00
Zhicheng Wang 2b6e7c8ca1 feat: 翻译完了 NgModule 部分 2018-03-21 14:02:05 +08:00
Zhicheng Wang 37e19cd50b feat: 自动在中英文之间添加空格，以改善排版 2018-03-20 17:15:36 +08:00
Zhicheng Wang 545d4b6c69 feat: 自动在中英文之间添加空格，以改善排版 2018-03-20 17:09:18 +08:00
Zhicheng Wang b9c59b2249 feat: 翻译了一部分 NgModule 的内容 2018-03-20 15:40:07 +08:00
Zhicheng Wang 935fdf30dc feat: 翻译完了 Observable 与 RxJS 2018-03-20 11:31:56 +08:00
Zhicheng Wang e0fc873240 fix: minor fix and auto translate based on previous result 2018-03-18 07:44:33 +08:00
Andrew Seguin 46efd4b938 feat(elements): George's comments (#22413) 
PR Close #22413
 2018-03-16 12:39:07 -07:00
Andrew Seguin 22b96b9690 feat(elements): add support for creating custom elements (#22413) 
PR Close #22413
 2018-03-16 12:39:07 -07:00
Victor Berchet 0ebd577db4 refactor(compiler): Drop support for the deprecated `<template>`. Use `<ng-template>` instead (#22783) 
BREAKING CHANGE:

The `<template>` tag was deprecated in Angular v4 to avoid collisions (i.e. when
using Web Components).

This commit removes support for `<template>`. `<ng-template>` should be used
instead.

BEFORE:

    <!-- html template -->
    <template>some template content</template>

    # tsconfig.json
    {
      # ...
      "angularCompilerOptions": {
        # ...
        # This option is no more supported and will have no effect
        "enableLegacyTemplate": [true|false]
      }
    }

AFTER:

    <!-- html template -->
    <ng-template>some template content</ng-template>

PR Close #22783
 2018-03-15 14:52:22 -07:00
Judy Bogart 02e6ac2117 docs: incorporate suggestions and corrections from gkalpak (#21569) 
PR Close #21569
 2018-03-15 14:48:35 -07:00
Judy Bogart 04ca77e38e docs(aio): update architecture section (#21569) 
PR Close #21569
 2018-03-15 14:48:35 -07:00
Zhicheng Wang 00cac11c4f fix: 把所有 project 翻译为项目而不是工程 2018-03-15 17:12:36 +08:00
Zhicheng Wang 95b04faeff fix: 翻译完了TS配置和发布的剩余部分 2018-03-15 17:10:51 +08:00
Zhicheng Wang 18ac616385 fix: 修改了《环境准备与部署》中剩下的部分 2018-03-15 16:15:18 +08:00
Zhicheng Wang dd5a7861cb fix: 翻译了《风格指南》中剩余的部分 2018-03-15 16:08:29 +08:00
Zhicheng Wang e45599eac1 fix: 对《测试》进行微调 2018-03-15 15:57:16 +08:00
Zhicheng Wang cae70fab87 fix: 翻译完了《测试》的剩余部分 2018-03-15 15:48:26 +08:00
Zhicheng Wang 6d5cfd568b fix: 翻译了《测试》的一部分 2018-03-15 13:04:10 +08:00
Ward Bell 1f9734315d docs: testing - highlight dispatchEvent (#22726) 
PR Close #22726
 2018-03-14 10:21:41 -07:00
Zhicheng Wang 21ffc7d24f fix: 翻译了《速查表》的剩余部分 2018-03-14 09:26:46 +08:00
Zhicheng Wang 12f330a27f fix: 翻译《路由与导航》中遗漏的部分 
fix: 把 header 修复成双行对照的格式
 2018-03-14 09:13:52 +08:00
Zhicheng Wang 62afb2124d fix: 翻译《HttpClient》中遗漏的部分 2018-03-14 08:48:17 +08:00
Zhicheng Wang 73a40b825d fix: 翻译《Angular 依赖注入》中遗漏的部分 2018-03-13 09:06:53 +08:00
Zhicheng Wang 0ed2ae71e1 fix: 翻译《表单》和《引导启动》中遗漏的部分 2018-03-12 14:36:59 +08:00
Zhicheng Wang 964cefaeea fix: 翻译《表单》和《引导启动》中遗漏的部分 2018-03-12 14:25:24 +08:00
Zhicheng Wang 797d882858 fix: 翻译《动画》中遗漏的部分 2018-03-12 13:21:11 +08:00
Zhicheng Wang 0c420c2efc fix: 纠正错误及翻译遗漏的部分 2018-03-12 13:04:48 +08:00
Zhicheng Wang 69908c35f6 fix: merge PRs 2018-03-09 15:30:16 +08:00
Zhicheng Wang 31897aeb2c fix: 手工合并 https://github.com/angular/angular-cn/pull/265 2018-03-09 15:27:41 +08:00
buzzerrookie 1f8ada3fcf Update forms.md 2018-03-09 15:16:24 +08:00
Zhicheng Wang 636c072823 fix: 教程中的“我们”改成了“你” 2018-03-09 13:30:42 +08:00
Zhicheng Wang 524bb11cd5 fix: 公开改为公共 2018-03-09 13:23:04 +08:00
Kapunahele Wong 2ca77d80ec docs: refactor revert() and call to lifecylce hook, edit doc to changes (#22094) 
PR Close #22094
 2018-03-08 10:58:42 -08:00
Zhicheng Wang b7ceb9e211 fix: 修正了死链接 2018-03-07 16:48:44 +08:00
Zhicheng Wang 3136cc77ad fix: 把所有 plunker 替换为 Stackblitz 2018-03-07 16:15:21 +08:00
Zhicheng Wang f906fa5b29 fix: 翻译合并完毕，去掉以前版本的字典，只使用上一版 2018-03-07 15:55:33 +08:00
Zhicheng Wang 20d593d067 fix: 修正残留错误 2018-03-07 15:48:58 +08:00
Zhicheng Wang 964266f4b0 fix: 合并第一版的翻译 2018-03-07 15:42:49 +08:00
Zhicheng Wang fc58e0eee0 fix: 合并第二版的翻译 2018-03-07 14:54:27 +08:00
Zhicheng Wang c618678281 fix: 人工修订自动翻译 
fix: 标准化原文中的异常语句
 2018-03-07 13:29:22 +08:00
Zhicheng Wang 77c2e039f6 fix: 人工修订自动翻译 
fix: 只忽略 <div class="alert 元素
 2018-03-07 12:57:17 +08:00
Zhicheng Wang a94e7cba14 fix: 人工修订自动翻译 
fix: 拆解 tr
fix: 特殊拆解 back to top
 2018-03-07 12:45:12 +08:00
Zhicheng Wang 9adeb14f3a fix: 人工修订自动翻译 2018-03-07 12:26:05 +08:00
Zhicheng Wang abb1f1321b fix: a 不再自动换行 
fix: 修正自动翻译结果
 2018-03-07 11:28:22 +08:00
Zhicheng Wang 0e0ffa481e fix: 修正自动翻译结果 2018-03-07 11:25:56 +08:00
Zhicheng Wang 51bd598826 fix: 修正自动翻译结果 2018-03-07 10:55:42 +08:00
Zhicheng Wang 1c028aee24 fix: 提交没错误的自动翻译结果 2018-03-07 10:20:29 +08:00
Zhicheng Wang 16bd6edca0 fix: 错误的忽略了单行的 a 标签 2018-03-07 09:08:44 +08:00
yerkebulan 505ae752b6 docs(aio): update deprecated Http reference to HttpClientModule, remove Http reference because another context is used (#21984) 
docs(aio): change HttpClientModule reference to HttpClient

docs(aio): capitalize Http to HTTP

docs(aio): fix typo mistake in 'universal' guide

docs(aio): gets rid of the parentheses and the "e.g." in 'universal' guide

PR Close #21984
 2018-03-06 15:03:54 -08:00
Ward Bell d0db9ded90 docs: fix cli-quickstart doc and specs (#22338) 
* tests were broken
* incorrect instructions.
* didn't match current CLI template for new project

PR Close #22338
 2018-03-06 09:41:53 -08:00
SangKa.Z 3aea8fd5f3 docs(aio): fix table header (#22553) 
PR Close #22553
 2018-03-05 10:13:16 -08:00
Zhicheng Wang 206f6ecc4f fix: 修正最后一版的全部翻译 2018-03-04 09:07:33 +08:00
Zhicheng Wang e6ede6bded fix: 自动翻译了 http.md 2018-03-03 12:34:00 +08:00
Zhicheng Wang 7f04568b62 fix: 翻译完 forms.md 2018-03-03 11:48:01 +08:00
Zhicheng Wang 19f4ad46ae refactor: extract checker functions 2018-03-03 08:13:52 +08:00
Zhicheng Wang 6642b82445 fix: heads in original and translation must be same level 2018-03-01 22:28:13 +08:00
Zhicheng Wang 53a7a4cbf5 feat: add auto checker 
fix: some translations found by auto checker
 2018-03-01 22:19:59 +08:00
Kapunahele Wong c82cef8bc6 docs: fix dynamic component loader example (#22181) 
closes #21903

PR Close #22181
 2018-02-28 10:46:37 -08:00
Zhicheng Wang 89060a39df fix: 不正常的中英文段落合并 2018-02-28 13:44:53 +08:00
Zhicheng Wang 6b1d4a4890 fix: HttpModule => HttpClientModule 2018-02-28 13:22:43 +08:00
Zhicheng Wang cacdf7b564 fix: 修正多行合并到一起的错误 2018-02-28 13:20:10 +08:00
Zhicheng Wang f248973faa fix: polyfills 译为腻子脚本 2018-02-28 13:17:39 +08:00
Zhicheng Wang 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
Zhicheng Wang 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
Jason Aden 79656e7f96 docs(aio): add Observable and Rx docs (#21423) 
PR Close #21423
 2018-02-27 11:24:31 -08:00
Olivier Combe 82a791223c docs: update i18n guide for projects that don't use the cli (#21767) 
PR Close #21767
 2018-02-26 17:51:58 -08:00
Ward Bell a7e1f236ff docs: testing guide for CLI (#20697) 
- updates tests
- heavy prose revisions
- uses HttpClient (with angular-in-memory-web-api)
- test HeroService using `HttpClientTestingModule`
- scrub away most By.CSS
- fake async observable with `asyncData()`
- extensive Twain work
- different take on retryWhen
- remove app barrels (& systemjs.extras) which troubled plunker/systemjs
- add dummy export const to hero.ts (plunkr/systemjs fails w/o it)
- shrink and re-organize TOC
- add marble testing package and tests
- demonstrate the "no beforeEach()" test coding style
- add section on Http service testing
- prepare for stackblitz
- confirm works in plunker except excluded marble test
- add tests for avoidFile class feature of CodeExampleComponent

PR Close #20697
 2018-02-26 13:40:23 -08:00
Matias Niemelä b2f366b3b7 fix(animations): only use the WA-polyfill alongside AnimationBuilder (#22143) 
This patch removes the need to include the Web Animations API Polyfill
(web-animations-js) as a dependency. Angular will now fallback to using
CSS Keyframes in the event that `element.animate` is no longer supported
by the browser.

In the event that an application does use `AnimationBuilder` then the
web-animations-js polyfill is required to enable programmatic,
position-based access to an animation.

Closes #17496

PR Close #22143
 2018-02-22 16:07:53 -08:00
Kapunahele Wong 9eecb0b27f docs: fix deployment sample path (#22048) 
PR Close #22048
 2018-02-22 13:40:57 -08:00
Kapunahele Wong 022ad4a420 docs: fix ngmodules-jsmodules pre-req (#22316) 
closes #22157

PR Close #22316
 2018-02-22 11:20:47 -08:00
Kapunahele Wong a4f9e8180b docs: edit styleguide recommendation on components as elements (#22074) 
Change recommendation on using attributes for components since there are use cases including the use of <button mat-button> in MD

Closes #19401.

PR Close #22074
 2018-02-22 11:20:21 -08:00
Marco Alvarado b42921bbd2 docs(aio): updates directive event hooks real capabilities (#16654) 
Minor documentation update to include event hooks that were assumed to only work on components.

Closes angular/angular#10221

PR Close #16654
 2018-02-21 14:51:04 -08:00
zhilich 722dec11b0 docs(aio): Wrong code example. Form status field was added later in the guide. (#21275) 
PR Close #21275
 2018-02-21 11:06:47 -08:00
Kapunahele Wong 1c1cbba04b docs: add ngStyle to cheat sheet (#22070) 
PR Close #22070
 2018-02-20 16:08:15 -08:00
Oussama Ben Brahim f1a063298e feat(core): set preserveWhitespaces to false by default (#22046) 
Fixes #22027

PR Close #22046
 2018-02-16 09:06:14 -08:00
Kapunahele Wong 3a0b5a928c docs(aio): fix extraneous divs (#22069) 
PR Close #22069
 2018-02-14 15:02:36 -05:00
Oussama Ben Brahim eb48750705 docs(aio): fix typo in "preserveWhitespaces" example (#22182) 
Fixes #22147

PR Close #22182
 2018-02-12 15:57:42 -08:00
Suguru Inatomi 88bec238ac fix(aio): remove broken span closing tag (#22146) 
PR Close #22146
 2018-02-12 10:01:10 -08:00
Mikhail Burshteyn c3484450b8 docs: fix typo in http.md (#22058) 
PR Close #22058
 2018-02-09 13:10:23 -08:00
Pete Bacon Darwin 7007f51c35 feat(aio): first pass API docs redesign (#21874) 
Includes:

* display ToC for API docs
* update dgeni-packages to 0.24.1
* add floating sidebar in API docs
* add breadcrumbs and structured data for Google crawler
* improved rendering of method overloads
* properties rendered in a table
* params rendered with docs
* removal of outdated "infobox" from all API docs

PR Close #21874
 2018-02-09 13:05:16 -08:00
Trotyl bc1e22922a docs(aio): several fix for ngmodule guides (#21517) 
PR Close #21517
 2018-02-09 13:03:47 -08:00
Kapunahele Wong 83d43ac850 docs(aio): remove lifecycle hooks img (#21425) 
PR Close #21425
 2018-02-07 16:09:44 -08:00
Chuck Jazdzewski b37cee36f9 fix(language-service): correct instructions to install the language service (#22000) 
Fixes: #21956

PR Close #22000
 2018-02-07 12:09:00 -08:00
Aric Thorn cd4c0eab94 docs(forms): Custom Validator example selector name incorrect. (#20464) 
Name of selector in ForbiddenName example is not consistent with Validator class nor Html selector example. Added the selector name 'appForbiddenName' as an alias name for the input of the Validator class, and updated the view accordingly.

Fixes: #20206

PR Close #20464
 2018-02-07 12:01:12 -08:00
Judy Bogart 9d3326caa7 docs: clarify npm/yarn commands, add blank lines to mix md/html in table (#21606) 
PR Close #21606
 2018-02-05 13:02:14 -08:00
Judy Bogart 1940b18124 docs: update browser support (#21606) 
PR Close #21606
 2018-02-05 13:02:13 -08:00
Jannis Lehmann 7b120b5f73 docs: consistency fix in describing a custom tag (#21747) 
PR Close #21747
 2018-02-02 07:53:18 -08:00
Pete Bacon Darwin de25d1886e docs(aio): update docs changelog with links to ts-to-js guide (#21763) 
PR Close #21763
 2018-02-02 07:52:30 -08:00
JiaLi.Passion 447783e575 docs: add docs for IE (#21824) 
PR Close #21824
 2018-02-02 07:51:46 -08:00
musicq d3c2aa5f95 docs: add missing underline (#21892) 
PR Close #21892
 2018-02-02 07:49:32 -08:00
yerkebulan f9fa157a09 docs(aio): add missing closing `<code-examle>` tag (#21771) 
PR Close #21771
 2018-02-01 08:31:20 -08:00
Alex Rickabaugh db3e65fb17 docs(service-worker): describe safety-worker.js in SW guide (#21921) 
PR Close #21921
 2018-01-31 10:25:14 -08:00
Ward Bell 7a20691f13 docs: add http guide sample and adjust text (#21326) 
PR Close #21326
 2018-01-31 10:24:43 -08:00
Bernd Hacker 72265f796f fix(aio): missing plural s in preserveWhiteSpaces example (#21854) 
PR Close #21854
 2018-01-29 11:35:13 -08:00
Eli Sadoff 6e8bc310f0 docs: change ”it's" to "its" as needed in several docs. (#21867) 
Most of them are in content but one is in common and needs special approval.

PR Close #21867
 2018-01-29 11:34:46 -08:00
Pete Bacon Darwin 23596b3f30 docs(aio): fix missing stylesheet in component-styles example (#21772) 
The code in the example was referring to `hero-app.component.css` but this did
not exist.

PR Close #21772
 2018-01-25 13:38:12 -08:00
Miško Hevery 92ddd46bcc Revert "docs(aio): update docs changelog with links to ts-to-js guide (#21712)" 
This reverts commit 43d1b9864f.
 2018-01-24 15:50:41 -08:00
George Kalpakas d0e086a5fe fix(aio): remove remaining `plnkr` references (#20165) 
PR Close #20165
 2018-01-23 21:30:27 -08:00
Jesus Rodriguez 1a75934cc0 build(aio): migrate plunker to stackblitz (#20165) 
PR Close #20165
 2018-01-23 21:30:27 -08:00
Pete Bacon Darwin 43d1b9864f docs(aio): update docs changelog with links to ts-to-js guide (#21712) 
PR Close #21712
 2018-01-23 13:33:36 -08:00
JiaLi.Passion e82812b9a9 docs: fix #19989, add zone flags(blacklist/module) in guide (#21701) 
PR Close #21701
 2018-01-23 13:33:10 -08:00
Denny Brown 8c51c276c7 docs: fix stray div and reformat paragraph (#21676) 
PR Close #21676
 2018-01-19 20:40:13 -08:00
Fabian Wiles c8a1a14b87 docs: clarify the use of classes and interfaces in style guide (#20919) 
PR Close #20919
 2018-01-18 18:22:55 -06:00
Chuck Jazdzewski 64d16dee02 feat(compiler): implement "enableIvy" compiler option (#21427) 
The "enableIvy" compiler option is the initial implementation
of the Render3 (or Ivy) code generation. This commit enables
generation generating "Hello, World" (example in the test)
but not much else. It is currenly only useful for internal Ivy
testing as Ivy is in development.

PR Close #21427
 2018-01-18 18:22:44 -06:00
George Kalpakas 44a4b1680f docs: improve/simplify example for `providers` guide (#21589) 
PR Close #21589
 2018-01-18 18:22:20 -06:00
George Kalpakas 4596b9d0df docs: fix/improve example for `singleton-services` guide (#21589) 
PR Close #21589
 2018-01-18 18:22:20 -06:00
George Kalpakas 81e87095b4 docs: several minor `NgModule` guide fixes/improvements (#21589) 
PR Close #21589
 2018-01-18 18:22:20 -06:00
George Kalpakas bf248792eb docs: minor fixes (anchor tags, redundant whitespace, consistent code-snippets lang) (#21589) 
PR Close #21589
 2018-01-18 18:22:20 -06:00
Vani 1ce46b56f8 docs: change titles to sentence case (#21620) 
PR Close #21620
 2018-01-18 18:22:09 -06:00
Kapunahele Wong af2a843446 docs: edit entry component FAQ (#21487) 
PR Close #21487
 2018-01-17 17:14:33 -08:00
Kapunahele Wong 02377335ec docs: add server side redirect and fix NgModule FAQ links (#21487) 
PR Close #21487
 2018-01-17 17:14:33 -08:00
Kapunahele Wong e79e98ab44 docs: fix lazy loading example dir name (#21475) 
PR Close #21475
 2018-01-17 17:02:41 -08:00
Alan Agius 030c68df32 docs(aio): change `df-question` to `app-question` (#21438) 
closes: #21404
PR Close #21438
 2018-01-17 07:20:17 -08:00
Chuck Jazdzewski 2d44a2ab0d docs(compiler): document the $any type cast function (#20968) 
Closes #20966

PR Close #20968
 2018-01-12 14:37:26 -08:00
Kapunahele Wong 00300f66e8 docs(forms): clarify note in reactive forms doc (#21134) 
PR Close #21134
 2018-01-11 07:03:55 -08:00
Kapunahele Wong 53f91189a1 docs(aio): add NgModule docs (#20306) 
PR Close #20306
 2018-01-10 16:26:46 -08:00
Anton Strogonoff 27196b676b docs(aio): fix punctuation for clarity (#21325) 
PR Close #21325
 2018-01-08 16:12:24 -08:00
chembu e99475260f docs(aio): document the template compiler options (#21333) 
PR Close #21333
 2018-01-08 13:23:16 -05:00
courtneypattison 03d16fcd24 docs(aio): add missing imports to interceptor example (#21259) 
PR Close #21259
 2018-01-04 17:40:34 -05:00
Dawid Winiarczyk d365077dfa docs(aio): HttpClientXsrfModule withConfig => withOptions (#21185) 
Docummentation suggests use of HttpClientXsrfModule#withConfig but this method looks like it's renamed to #withConfig.
https://angular.io/guide/http#configuring-custom-cookieheader-names
PR Close #21185
 2018-01-02 10:29:07 -06:00
Dmitry Fisenko bc66d27938 docs(service-worker): fix word wrap (#21114) 
The fix removes space between 'c' and 'aches' in docs

PR Close #21114
 2017-12-21 20:12:18 -08:00
chembu f593552cfe docs(aio): Rename service worker files, update examples, move service worker under Techniques 2017-12-19 11:07:57 -08:00
Dmytro Yarmak 8458647232 docs(aio): fix inconsistency in lifecycle hooks table 2017-12-19 10:48:29 -08:00
Alex Rickabaugh 20e1cc049f fix(service-worker): check for updates on navigation 
Currently the Service Worker checks for updates only on SW startup,
an event which happens frequently but also nondeterministically. This
makes it hard for developers to observe the update process or reason
about how updates will be delivered to users. This problem is
exacerbated by the DevTools behavior of keeping the SW alive
indefinitely while opened, effectively preventing the page from
updating at all.

This change causes the SW to additionally check for updates on
navigation requests (app page reloads). This creates deterministic
update behavior, and is much easier for developers to reason about.
It does leave the old update-on-SW-startup behavior in place, as
removing that would be a breaking change.

Fixes #20877
 2017-12-15 15:19:20 -08:00
Trotyl Yu 225baf4686 docs(aio): fix typo for missing quote (#20888) 
PR Close #20888
 2017-12-08 10:06:41 -08:00
Kapunahele Wong 9bbec42a6c docs(aio): add service worker guide content and update nav (#20736) 
PR Close #20736
 2017-12-06 06:52:20 -08:00
Olivier Combe be994496cd docs(core): add docs for i18n tokens (#17920) 
PR Close #17920
 2017-12-05 21:56:43 -08:00
hartraft 77ef527993 docs(aio): update myUnless references to appUnless (#20658) 
fixes Issue Number: #20447

PR Close #20658
 2017-12-05 21:54:39 -08:00
Ward Bell 5e25d3986d docs: component-styles guide - inline styles must be CSS (#20701) 
Cannot write them in less, sass, or stylus
See CLI issue https://github.com/angular/angular-cli/issues/8472

PR Close #20701
 2017-12-05 21:54:23 -08:00
ite-klass 18793c896b docs(aio): Fix typo (#20732) 
Remove duplicate word 'to'

PR Close #20732
 2017-12-05 21:46:56 -08:00
George Kalpakas 47addd169d revert: docs(aio): add service worker guide content and update nav (#20021) (#20716) 
* revert: style: broken build due to missing new lines

This reverts commit ba6af2a6dd.
The commit that introduced these files (48300067f) will also get
reverted.

* revert: docs(aio): add service worker guide content and update nav (#20021)

This reverts commit 48300067fb.
This commit has some issues (e.g. breaks some e2e tests, adds images
to the wrong directories, breaks linting, etc).
Reverting in order to investigate and fix.
 2017-11-30 09:53:07 -08:00
Kapunahele Wong 48300067fb docs(aio): add service worker guide content and update nav (#20021) 
PR Close #20021
 2017-11-29 12:15:27 -06:00
briancherin eaaae2edf4 docs: fix grammar and wording (#18530) 
PR Close #18530
 2017-11-28 22:27:02 -06:00
Ward Bell 816d5ba3fd docs: NgModule guide prose for CLI (partial) (#19776) 
Also replaces “Angular Module” with “NgModule” wherever that is clarifying.
Continue using “module” when qualified as in “feature module”, “root module”, “routing module”, etc.

PR Close #19776
 2017-11-20 18:39:25 -06:00
Leo Globerman 1adbcda12e docs(aio): fix wrong copy (#20431) 
PR Close #20431
 2017-11-14 15:58:25 -08:00
Levi Zitting b9bd3204f2 docs(aio): fix broken link in guide/component-interaction (#20411) 
add a blank line before line with markdown link
PR Close #20411
 2017-11-14 10:00:46 -08:00
Marcelo Melo e5c4371d72 docs(aio): fix typo in filename (packages.json --> package.json) (#20377) 
PR Close #20377
 2017-11-14 10:00:39 -08:00