ba3152bb88
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/_includes/_hero-home.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/guide/style-guide.jade
2016-09-17 12:01:41 +08:00
6f6f89ed9c
把所有“内建”改为“内置”
2016-09-17 11:46:17 +08:00
9a2aa3cc7d
找回一些丢失的翻译
2016-09-16 16:01:59 +08:00
f0ff5e26bd
docs(style-guide): attributes aren't comma separated ( #2372 )
...
A fix necessary for ng2.io
2016-09-15 17:18:41 -07:00
2417245114
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/_data.json
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_hero.jade
# public/_includes/_main-nav.jade
# public/_includes/_util-fns.jade
# public/docs/_includes/_side-nav.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.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/ngmodule.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/style-guide.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/testing/_data.json
# public/docs/ts/latest/testing/application-under-test.jade
# public/docs/ts/latest/testing/first-app-tests.jade
# public/docs/ts/latest/testing/index.jade
# public/docs/ts/latest/testing/jasmine-testing-101.jade
# public/docs/ts/latest/testing/testing-an-angular-pipe.jade
# public/index.jade
# public/resources/css/main.scss
# public/resources/css/module/_side-nav.scss
2016-09-15 15:23:48 +08:00
39c5a2b949
Rc5 doc sweep ( #2218 )
...
* Removed 03-05, 04-12, 04-15.
Removed style for whitespace in imports.
Removed + sign prefix for routing folders. Updated all code.
Removed style that said to use lazy loading. There was no value in the style other than use it :)
* renamed componet router to router
2016-09-13 18:51:03 -07:00
969da7d321
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/_includes/_scripts-include.jade
# public/docs/_examples/homepage-hello-world/ts/index.1.html
# public/docs/_examples/homepage-tabs/ts/index.1.html
# public/docs/_examples/homepage-todo/ts/index.1.html
# public/docs/_examples/systemjs.config.plunker.build.js
# public/docs/_examples/systemjs.config.plunker.js
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/cookbook/component-relative-paths.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/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/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/typescript-configuration.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/toh-pt6.jade
# public/features.jade
# public/resources/js/directives/live-example.js
# tools/plunker-builder/indexHtmlTranslator.js
2016-09-08 17:20:01 +08:00
d01898f474
docs(style-guide): fix two broken regions
...
closes #2159
2016-08-24 23:45:55 -07:00
e5995453ed
review: patch up style-guide
2016-08-16 11:14:32 +01:00
94aa3664ab
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# .gitignore
# public/docs/_examples/cb-component-communication/ts/app/app.component.ts
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/cookbook/dynamic-form.jade
# public/docs/ts/latest/cookbook/set-document-title.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/quickstart.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
2016-08-12 07:57:51 +08:00
d79adb2422
docs(rc5): update docs and plunkers for rc5
2016-08-09 11:48:07 -07:00
3e9394f62a
校对合并结果
2016-07-16 17:47:55 +08:00
0e14785cba
Merge remote-tracking branch 'angular.io/master'
...
# Conflicts:
# README.md
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/testing/first-app-tests.jade
# public/docs/ts/latest/testing/jasmine-testing-101.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
2016-07-15 15:52:34 +01:00
a8091f5b84
docs(style-guide): remove routing from TOC
...
closes #1856
2016-07-14 14:19:48 -07:00
98e5d4af77
docs(all): link cleanup - broken and outdated
...
closes #1841
Fixes all broken links except genuine errors (see #1840 ), have been
resolved as of 2016-07-06
(https://github.com/angular/angular/commit/2708ce6a17667a2369c83bcf244c9
366b058d4c9).
Fixes #1574
2016-07-11 21:50:07 -07:00
273a0fd1e8
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/ts/latest/guide/displaying-data.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/webpack.jade
2016-07-11 08:32:56 +08:00
0664a271ba
docs(style-guide): spell const variables in lower camel case
...
Changes previous guidance on const which insisted on UPPER_SNAKE_CASE
2016-07-07 22:41:04 -07:00
21fe9dc1d2
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/lifecycle-hooks.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/testing/first-app-tests.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
# public/news.jade
2016-07-01 08:24:23 +08:00
b21c90c358
fix(doc): fix 404 problem of some api url
2016-06-28 22:25:24 -07:00
bb9adc3eba
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/dynamic-form.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/style-guide.jade
2016-06-23 08:48:57 +08:00
31d0c757d7
chore(style-guide): remove routing styles
...
Routing styles were breaking CI and are out of date, since we're using the 3.0.0 router.
We should remove them until we have recommendations.
2016-06-21 18:11:54 -07:00
64b9e476fb
把alternative统一改为备选或替代品（取决于语境）
2016-06-21 07:54:34 +08:00
7995cb4897
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/ts/latest/guide/style-guide.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
2016-06-14 14:04:30 +08:00
bc2e4b83c0
把所有全角括号改成了半角的
2016-06-14 09:26:54 +08:00
ce05f9b4f9
docs(style-guide): make each style clickable for easier referencing
2016-06-13 10:24:58 -07:00
633964ac2f
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/upgrade.jade
2016-06-04 17:52:51 +01:00
8fe68f414a
docs(style-guide): fix 03-03 css class
...
closes #1582
2016-06-04 01:15:13 -07:00
9164069f36
adjustment to style-guide.jade references.
2016-06-02 09:30:16 +01:00
57a0ca5873
translate new lines for style-guide, after merge.
2016-06-02 09:15:49 +01:00
dd4e887b47
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/upgrade.jade
2016-06-02 08:58:19 +01:00
41947cbd1f
chore: fix gulp serve-and-sync tasks and many broken example links
...
The serve-and-sync tasks wait for `_copy-example-boilerplate` to finish
Differentiates app compile, spec compile, and test failures
StyleGuide (for documentators) up-to-date
2016-06-01 16:17:06 -07:00
6fd62e9baf
docs(style-guide): make style guide code compliant with itself
...
closes #1578
2016-06-01 11:15:57 -07:00
0a0f78f144
docs(style-guide): make barrels a consider
...
closes #1482
2016-06-01 10:59:41 -07:00
3d27aa656c
docs(style-guide): add the image width attribute
...
closes #1366
Adjust width 100% to 80%
2016-06-01 10:54:48 -07:00
17d6eeb1e2
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/quickstart.jade
2016-05-25 11:13:25 +01:00
cb756a5a05
统一了大量Attribute和Property的翻译
...
更新了小抄
调整了翻译样式
2016-05-24 11:33:50 +08:00
915de49863
docs(style-guide): rename avoid template at 05-03
...
closes #1484
2016-05-23 12:32:26 -07:00
020abd810f
docs(style-guide): a service doesn't have a folder
...
closes #1481
2016-05-23 12:27:32 -07:00
6475b5efab
docs(style-guide): added the one more why on 02-02
...
closes #1473
2016-05-22 20:18:01 -07:00
ae3b205c77
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/style-guide.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
2016-05-21 21:02:15 +08:00
156b6f42ee
docs(style-guide): fix example on 02-04
...
closes #1452
2016-05-20 22:55:37 -07:00
aadbeb3ae9
修正一些合并中的问题
2016-05-19 19:23:01 +08:00
5f1f27e09c
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/_data.json
# public/_includes/_hero-home.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/attribute-directives.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/style-guide.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt4.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/news.jade
# public/resources/index.jade
2016-05-19 13:33:02 +08:00
8f01383b6c
烹饪书-依赖注入 二审完毕
...
烹饪书-动态表单 二审完毕
烹饪书-设置文档标题 二审完毕
2016-05-18 11:38:10 +08:00
e139c6b561
烹饪书-组件通讯 二审完毕
2016-05-17 19:29:33 +08:00
aad6313ff2
基础知识-风格指南 二审完毕
2016-05-16 23:10:44 +08:00
74c5868747
修正pattern的翻译，开始js-to-ts翻译。
2016-05-16 11:20:52 +01:00
fca9671680
docs(style-guide): lift main.ts to src folder
...
closes #1390 , #1361
2016-05-15 15:44:32 -07:00
738207affd
docs(style-guide): added ng2 snippets for vim
...
closes #1381
2016-05-15 15:29:47 -07:00
701af71eab
format adjustment for style-guide.jade
2016-05-14 10:38:56 +01:00
Zhicheng Wang
Patrice Chalin
John Papa
Jesús Rodríguez
Zhimin YE (Rex)
Peter Bacon Darwin
Patrice Chalin
Ward Bell
priestch
Filipe Silva
Brian Olore
NFM
Shai Reznik
Rex Ye
Mike Hartington