67 Commits

Author SHA1 Message Date
Zhimin YE (Rex)
e5995453ed review: patch up style-guide 2016-08-16 11:14:32 +01:00
Zhicheng Wang
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
Peter Bacon Darwin
d79adb2422 docs(rc5): update docs and plunkers for rc5 2016-08-09 11:48:07 -07:00
Zhicheng Wang
3e9394f62a 校对合并结果 2016-07-16 17:47:55 +08:00
Zhimin YE (Rex)
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
Foxandxss
a8091f5b84 docs(style-guide): remove routing from TOC
closes #1856
2016-07-14 14:19:48 -07:00
Patrice Chalin
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
Zhicheng Wang
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
Ward Bell
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
Zhicheng Wang
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
priestch
b21c90c358 fix(doc): fix 404 problem of some api url 2016-06-28 22:25:24 -07:00
Zhicheng Wang
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
Filipe Silva
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
Zhicheng Wang
64b9e476fb 把alternative统一改为备选或替代品(取决于语境) 2016-06-21 07:54:34 +08:00
Zhicheng Wang
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
Zhicheng Wang
bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Brian Olore
ce05f9b4f9 docs(style-guide): make each style clickable for easier referencing 2016-06-13 10:24:58 -07:00
Zhimin(Rex) YE
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
Foxandxss
8fe68f414a docs(style-guide): fix 03-03 css class
closes #1582
2016-06-04 01:15:13 -07:00
Zhimin YE (Rex)
9164069f36 adjustment to style-guide.jade references. 2016-06-02 09:30:16 +01:00
Zhimin YE (Rex)
57a0ca5873 translate new lines for style-guide, after merge. 2016-06-02 09:15:49 +01:00
Zhimin YE (Rex)
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
Ward Bell
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
Foxandxss
6fd62e9baf docs(style-guide): make style guide code compliant with itself
closes #1578
2016-06-01 11:15:57 -07:00
Foxandxss
0a0f78f144 docs(style-guide): make barrels a consider
closes #1482
2016-06-01 10:59:41 -07:00
NFM
3d27aa656c docs(style-guide): add the image width attribute
closes #1366
Adjust width 100% to 80%
2016-06-01 10:54:48 -07:00
Zhimin YE (Rex)
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
Zhicheng Wang
cb756a5a05 统一了大量Attribute和Property的翻译
更新了小抄
调整了翻译样式
2016-05-24 11:33:50 +08:00
Foxandxss
915de49863 docs(style-guide): rename avoid template at 05-03
closes #1484
2016-05-23 12:32:26 -07:00
Foxandxss
020abd810f docs(style-guide): a service doesn't have a folder
closes #1481
2016-05-23 12:27:32 -07:00
Shai Reznik
6475b5efab docs(style-guide): added the one more why on 02-02
closes #1473
2016-05-22 20:18:01 -07:00
Zhicheng Wang
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
Foxandxss
156b6f42ee docs(style-guide): fix example on 02-04
closes #1452
2016-05-20 22:55:37 -07:00
Zhicheng Wang
aadbeb3ae9 修正一些合并中的问题 2016-05-19 19:23:01 +08:00
Zhicheng Wang
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
Zhicheng Wang
8f01383b6c 烹饪书-依赖注入 二审完毕
烹饪书-动态表单 二审完毕
烹饪书-设置文档标题 二审完毕
2016-05-18 11:38:10 +08:00
Zhicheng Wang
e139c6b561 烹饪书-组件通讯 二审完毕 2016-05-17 19:29:33 +08:00
Zhicheng Wang
aad6313ff2 基础知识-风格指南 二审完毕 2016-05-16 23:10:44 +08:00
Rex Ye
74c5868747 修正pattern的翻译,开始js-to-ts翻译。 2016-05-16 11:20:52 +01:00
Foxandxss
fca9671680 docs(style-guide): lift main.ts to src folder
closes #1390, #1361
2016-05-15 15:44:32 -07:00
Mike Hartington
738207affd docs(style-guide): added ng2 snippets for vim
closes #1381
2016-05-15 15:29:47 -07:00
Zhimin(Rex) YE
701af71eab format adjustment for style-guide.jade 2016-05-14 10:38:56 +01:00
Zhimin(Rex) YE
208b79f742 adjustment to style-guide.jade 2016-05-14 00:37:28 +01:00
Zhimin(Rex) YE
05f0e9c377 review of style-guide.jade. 2016-05-14 00:05:06 +01:00
Zhimin(Rex) YE
9c1c70967d Revert "first review of style-guide.jade is done."
This reverts commit 732680d331d6c11f1f95a602a0fa1927f5e40f5d.
2016-05-13 18:16:17 +01:00
Rex
732680d331 first review of style-guide.jade is done. 2016-05-13 14:08:36 +01:00
Zhimin(Rex) YE
88fdcd6a93 draft translation for style-guide.jade is completed. 2016-05-12 20:33:30 +01:00
Oren Farhi
82a5bfc5bf docs(style-guide): added ng2 snippets for sublime text
closes #1328
2016-05-11 19:20:01 -07:00
Gregor Woiwode
f6f407275f References snippets for atom 2016-05-11 18:53:09 -07:00
Rex
55722de87a Merge branch 'master' of https://github.com/angular-live/angular.io 2016-05-11 17:04:34 +01:00