Commit Graph

222 Commits

Author SHA1 Message Date
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
Foxandxss b1419f48ba chore: fix regions for e2e specs
closes #1657
2016-06-13 11:21:14 -07:00
Zhicheng Wang c802c2b5dc 来自网友张旋和Z的修改意见 2016-06-13 17:20:08 +08:00
Zhimin(Rex) YE ce299be58b Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/quickstart.jade
2016-06-02 22:29:17 +01:00
Patrice Chalin b48cde3a43 chore(_util-fns): generalize makeExample, drop makeProjExample (#1510)
+ Rename adjustExample{Path|Title} to adjustTsExample*4Dart
+ `makeExample` can now work with both doc folder relative and project
relative paths.
2016-06-02 17:06:03 +01:00
Zhimin YE (Rex) 72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-01 09:51:27 +01:00
Patrice Chalin 5e50b2ef10 chore(util-fns): minor cleanup and refactoring (#1562)
This only impacts language dependent variable and path definitions:
- Removed deprecated variable.
- Hoisted useful variable definitions from quickstart into _util-fns.
- Minor fix in regexp of path translation function
2016-05-31 15:25:59 -07:00
Zhimin(Rex) YE 76aed6e600 minor fix on npm-package.jade
uncomment mixin for js docs.
2016-05-27 00:51:01 +01:00
Zhimin(Rex) YE cbea511cad Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/guide/template-syntax.jade
2016-05-26 23:48:22 +01:00
Zhimin(Rex) YE 70f534cc2a removed js/dart languages from dropdown list.
review for displaying-data.jade and index.jade.
2016-05-26 22:52:50 +01:00
Patrice Chalin a664f46231 docs(template-syntax): review and update Dart to new doc design (#1465)
* ts template-syntax.jade without docregion tags
* update guide/template-syntax for dart and ts
* clarify style property naming in Dart
2016-05-25 15:09:45 -07:00
Zhicheng Wang 33aed368c9 微调 2016-05-25 21:18:25 +08:00
Zhicheng Wang 7f6b69e9d2 略作修改,加上了到官网的链接 2016-05-25 11:20:05 +08:00
Zhicheng Wang af32ef14ca 去掉到firebase的cdn 2016-05-20 08:52:52 +08:00
Zhicheng Wang 4840597b5f 修改了一些错误和未翻译的地方 2016-05-19 16:47:48 +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
Kathy Walrath a595eb81ef docs(dart): update BASICS intro (#1410)
Also copy edited the TS version a bit.
2016-05-18 13:43:02 -07:00
Patrice Chalin 5b1a84be4c chore(docs): revise makeExcerpt mixin, add makeProjExample mixin
Be more DRY when referencing examples and excerpts. E.g.,
```jade
+makeExcerpt('quickstart/ts/app/app.component.ts', 'import',
'app/app.component.ts (import)')
```
can now be just
```jade
+makeExcerpt('app/app.component.ts', 'import')
```
Defined new mixin for examples named `makeProjExample` using this new
scheme.
The original `makeExample` has been left untouched.

Applied new mixins to quickstart.

closes #1420
2016-05-18 10:27:51 -07:00
Eric Jimenez 5a0a0160ce feat(firebase): feed resources page using firebase. Check for approved entries of the resources page 2016-05-16 22:43:32 -04:00
Eric Jimenez 21272435a3 feat(badging): Enum only matches enums, as opposed to Const and Enums. Const matches const, var, and let 2016-05-16 22:41:43 -04:00
Patrice Chalin fedc39dd52 docs(quickstart-ts/dart): updated prose and example code; consolidate for TS&Dart
closes #1396
2016-05-15 19:26:45 -07:00
Zhicheng Wang 0ee5264d19 实现了显示/隐藏原文的功能
用jqLite重构了翻译逻辑
2016-05-15 21:28:20 +08:00
Zhicheng Wang e498eaaeff 修正对照翻译功能的小问题 2016-05-14 19:26:08 +08:00
Patrice Chalin ad95b04e69 docs(dev guide): pipes - new Dart prose, update Dart and Ts code (#1353)
+ guide/pipes/ts: update docs and example code

+ guide/pipes/dart: new prose, updated example code

+ fix platform_directives reference; html cleanup

+ enable pipes e2e testing
For `e2e-spec.js`: If the async test is executed too early it will fail
(simply because the async message hasn’t been received yet).

+ follow new constants naming convention
2016-05-13 21:44:14 +01:00
Zhicheng Wang 74547be9e2 修改了翻译的一些小bug 2016-05-13 13:29:08 +08:00
Zhicheng Wang 3634128fff 初步实现了对照翻译功能:自动隐藏原文,并把原文的文本内容设置为译文的title 2016-05-13 13:02:01 +08:00
Eric Jimenez b5d2973163 feat(security badge): add a security badge to api docs. Only appears if @security is present in angular2 2016-05-12 17:48:54 -07:00
Patrice Chalin ef66e38e54 docs(dev guide): Update 'Component Styles' prose (#1320)
Reowork Ts prose and add Dart prose/code

+ Updates to docs and example code

(Starting point for Dart code was taken from #1171.)
2016-05-10 08:51:23 +01:00
Naomi Black 6d80a42bea chore(hero): remove the ng-conf banner post-event 2016-05-09 23:23:11 -07:00
Zhicheng Wang ae6ae103c0 完善了翻译的About。加上了首页的链接。 2016-05-09 19:30:30 +08:00
Patrice Chalin e958be24bf docs(dev guide): attribute-directives - updated dart/ts code and new dart prose
Mainly copyedits and prep for extension

+ example code cleanup & bug fix
+ fix bug in default color initialization
2016-05-06 15:42:01 +01:00
Patrice Chalin ac92e77611 docs(dev guide): lifecycle-hooks - updated dart/ts code and new dart prose
Mainly copyedits, but also

- Dart .jade extends TS .jade file with minor overrides
- Significant update of example code (so it matches the ts example in its
appearance and behavior).
- Tweaks to Dart code.
- A few extra/corrected mixin definitions in `_util-fns.jade`.
2016-05-06 14:17:34 +01:00
Zhicheng Wang efd0a42eac 翻译完了DI 2016-05-05 23:32:48 +08:00
Patrice Chalin ce6c645501 docs(dev guide): structural-directives - ts minor edits, dart first versiondocs(dev guide): structural-directives - ts minor edits, dart first version (#1277)
Copyedits and other minor edits for TS
+ first version of the chapter for Dart
2016-05-04 13:18:38 +01:00
Zhicheng Wang 583247f0f9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	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/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/features.jade
#	public/index.jade
2016-05-03 22:33:20 +08:00
Naomi Black f96c0c7d77 chore(hero): update hero banner for ngconf livestream 2016-05-02 15:08:00 -07:00
Eric Jimenez 410b3741f7 feat(images): new frontpage as directed by Alex Wolfe. New images from Fatima Remtullah 2016-05-02 13:03:13 -07:00
Naomi Black 68503b9e41 chore(updates): update resources and livestream hero 2016-05-02 12:02:48 -07:00
Naomi Black 62623d5f9b chore(resources): update resources links and header and footer 2016-04-29 22:57:18 -07:00
Eric Jimenez 36308fe5f6 fix(footer): use cursor pointer on feedback in footer 2016-04-29 17:25:19 -07:00
Eric Jimenez af9793cbbb feat(resources): add more pages. Increase font size. Rename in footer. All encompassing resource page 2016-04-29 20:07:13 -04:00
Eric Jimenez 083842a1b1 feat(resources): add more pages 2016-04-29 18:02:19 -04:00
Eric Jimenez d8fcd5ef3d feat(nav reorg): reorganize footer and top nav 2016-04-28 19:23:13 -07:00
Patrice Chalin 1e64d9e57a docs(guide/dart): hierarchical-dependency-injection without copying
closes #1207
This uses a simpler way to render Dart prose from TS prose without
making a copy. This will make it _much_ easier to keep the two in sync.
2016-04-28 17:03:28 -07:00
Eric Jimenez fbeef5b8ee fix(badge align): fix alignment of badges on all screens. Simplify logic to achieve this 2016-04-26 10:53:53 -07:00
John Papa 3bc94147a7 docs(style-guide): add style-guide - v.3
closes #1170
2016-04-25 22:24:37 -07:00
Zhicheng Wang b86aa26da9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_includes/_main-nav.jade
#	public/_includes/_version-dropdown.jade
#	public/docs/_includes/_side-nav.jade
2016-04-23 15:13:58 +08:00
Ward Bell 0e63b1f39b chore: "Doc" menu retains current language #1060 2016-04-22 19:59:37 -07:00
alexwolfe 165f6933a6 Fixed shifting content on page load
Fixed shifting content when going from page to page in docs.
2016-04-22 15:49:10 -07:00
Zhicheng Wang 41d9204727 Merge branch 'master' of github.com:angular/angular.io
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2016-04-21 22:48:35 +08:00