4578087fa5
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# README.md
# harp.json
# public/_includes/_hero-home.jade
# public/docs/_examples/quickstart/ts/systemjs.config.1.js
# public/docs/dart/latest/_util-fns.jade
# public/docs/dart/latest/api/_data.json
# public/docs/dart/latest/api/index.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/cookbook/visual-studio-2015.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/change-log.jade
# public/docs/ts/latest/guide/npm-packages.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/template-syntax.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt3.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
Server Communication and Visual studio 2015 require further merging.
2016-11-03 15:38:23 +00:00
0d49fecd30
chore: update to @types ( #1872 )
...
* chore: update examples to @types
* fix toh-6 aot and add types link
2016-10-20 17:01:16 -07:00
f7c60a07df
fix： change all 他 > 它
2016-09-25 19:50:45 +01:00
d9af771f8d
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# README.md
# public/contribute.jade
# public/docs/_includes/_side-nav.jade
# public/docs/_includes/_ts-temp.jade
# public/docs/index.jade
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/component-relative-paths.jade
# public/docs/ts/latest/cookbook/index.jade
# public/docs/ts/latest/cookbook/set-document-title.jade
# public/docs/ts/latest/cookbook/visual-studio-2015.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/animations.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/browser-support.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/index.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/index.jade
# public/support.jade
2016-09-23 22:13:02 +01:00
693f6ae462
chore: rename Angular 2 to simply Angular ( #2402 )
2016-09-19 20:24:40 -07:00
6aeb8efaa3
fix: live example localisation.
2016-09-19 10:03:53 +01:00
94d48f2b95
fix: toh1 and 2
2016-09-19 10:00:09 +01:00
6f6f89ed9c
把所有“内建”改为“内置”
2016-09-17 11:46:17 +08:00
2a1c3626c5
去掉了大部分儿化音
...
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
f26ec0a889
(review:) Quick starter and TOH, patch up new paragraphs and mis-alignments.
2016-08-16 10:16:31 +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
c650436be1
Fix : #42 ES2105 -> ES2015
2016-07-28 09:07:52 +01:00
0303a18020
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/structural-directives.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/testing/testing-an-angular-pipe.jade
# public/docs/ts/latest/tutorial/index.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
# public/docs/ts/latest/tutorial/toh-pt6.jade
2016-07-07 08:15:51 +08:00
b0e0d94b5c
docs: revert Jade to markdown
...
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
2016-07-05 23:03:30 -07:00
24ab1e5fcc
Chore: break a line in toh-pt1
2016-07-04 12:00:32 +01:00
20c59f9e4a
Add some blank lines, to avoid unnecessary conflicts on merging.
2016-06-15 23:31:28 +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
2fc7e5ab50
docs(toh-1/ts): minor edits
...
closes #1615
- Fixed HTML.
- Removed unnecessary snippet since it is in the code.
- Copyedit: (Hero property) -> (hero property).
2016-06-13 10:28:04 -07:00
f2dbdb3163
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/_examples/cb-component-communication/e2e-spec.ts
# public/docs/_examples/cb-component-communication/ts/app/app.component.ts
# public/docs/_examples/dependency-injection/ts/app/main.1.ts
# 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-08 10:02:24 +08:00
7e52648ee7
docs(toh): update live example links ( #1602 )
2016-06-07 15:51:25 -07:00
86d151c40e
把QuickStart改成“快速起步”
2016-05-18 13:30:07 +08:00
0ee5264d19
实现了显示/隐藏原文的功能
...
用jqLite重构了翻译逻辑
2016-05-15 21:28:20 +08:00
15c927b29f
“教程-主从结构”一审完毕
...
把内置批量替换为内建
2016-05-11 20:34:47 +08:00
0e6820dc0b
“教程-英雄编辑器”一审完毕
2016-05-11 19:46:09 +08:00
a870e4401b
部分“格式（form）”改为“形式”
2016-05-11 19:34:38 +08:00
bca76787bb
部分监听改为监视 —— 监听只适用于listen的翻译
2016-05-11 19:30:44 +08:00
f397bf6608
把“Live Example 鲜活范例”统一译成“在线例子”
2016-05-11 14:47:32 +08:00
99d89072d5
把所有误用的他改成它
2016-05-09 21:50:33 +08:00
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
3d5302adce
chore: update to rc.0
2016-05-02 19:57:28 -07:00
bc9f46722f
教程第五章翻译了多一半儿，把黑板报批量改为仪表盘，把英雄之旅批量改为英雄指南
2016-04-17 23:31:22 +08:00
37d5fbcf1c
把display的译法从“展示”批量改为“显示”
...
译完第二章
2016-04-14 21:45:12 +08:00
84e96391ca
完成了导航菜单
...
完成了部分公共页面
完成了部分教程
2016-04-13 08:53:17 +08:00
5f73911eaf
chore(toh): change inputs array for input decorator/hero now a class
2016-03-25 16:51:46 -07:00
6ca1ac2c45
docs: instrucs for "download-and-go" development with quickstart source repo
2016-03-14 12:44:25 -07:00
b300d7b116
docs: add quickstart repository where needed
2016-03-14 09:11:50 -07:00
52ece7834a
docs(toh-pt1): revision suggested in #412
...
closes #941
2016-03-08 21:01:32 -08:00
746a6649b2
chore: new flat left navigation panel (all language tracks)
2016-03-03 04:51:52 -08:00
3d992384c3
chore(devguide/ts): to beta.6 + typings + related doc updates
2016-02-12 00:56:22 -08:00
79d3d9f0ad
docs(samples): convert boot.ts -> main.ts
...
plus router text fix and missed beta.2 update to QS.js
closes #773
2016-01-28 17:32:38 -08:00
82383bc673
docs(tutorial): part 3 + revisions to intro, 1 & 2
...
closes #573
2015-12-16 18:08:38 -08:00
4fda2c7854
docs(*): `npm run go` -> `npm start` (TS only)
...
closes #559
Convert npm script command from npm run go to npm start ...
because that's the way it should have been for TypeScript files.
2015-12-16 08:18:44 -08:00
ab5390a51e
docs(tutorial): combines all 4 sections + revisions/updates to a.53, hides 3&4
...
closes #488
ToH History (oldest-to-latest):
----------------------------
created code example/snippets files for use with +makeExample, replace usage of "pre.prettyprint.lang-bash" with this: code-example(format="." language="bash").
fixed spelling errors in examples file path used by +makeExample
changed usage of "code-example" to "+makeExample"
adding code example/snippets files used in toh 1
fixed example file paths, replaced "pre.prettyprint.lang-bash" with "code-example. "
(docs) toh-pt3 initial state
created code examples for display in jade, starting conversion of Google doc and trying +makeExample rendering
all text copied from doc to jade, still some styling and formatting to perform
completed conversion and styling, moved toh3 example files to "tutorial" folder under _examples
created specific code example files for chapter toh 3 and re-pathed references in +makeExample
minor edit
docs) toh combined - initial combined commit
updated ToH for a.52
tons of changes, including de-kebab-ing, removed src folder, updated tsconfig too
fixing snippets using incorrect ending input tag
using inline html and css for the app.component.
ToH Part 1 Code: updated the imports, removed obsolete directive delcarations
ToH Code Part 1: updated to use imports, interface. will hit others soon
toh part 1: ngModel fix
toh part1: removed obsolete story that referred to how we used to have to import and declare all directives we used. yay!
ToH Part 1: updated to use `boot.ts` and `app.component.ts`. this affected the partials, snippets, and the story.
toh part 1: using `npm run go`
toh parts 1 -4: modified all places to use `npm run go`
toh part 1: refactor for jade
toh part 1: fixing the code samples
toh part 2: seeping through the story
toh part 2: fixing snippets.
toh part 2: replaced ngClass with class.selected
toh part 2: removed whitespace
toh part 2: added final state to the code
toh: fixing paths
toh part 4: fixing src/app path to app
toh part 3: fixing folder path
toh part 2: fixed typo
toh part 2: typo on ngModel
toh part 2: added ngif
toh part 2: removed old hero property. moved the details lower, where we need it
toh index: updated hero list image to show consistent styling as the other images here
QS spelling error (targes -> targets)
tweeks: space and ngIF
2015-12-14 19:57:55 -08:00
2843cf2d5d
docs: fix dead links in toh-p1; closes #393
2015-11-23 16:39:42 -08:00
8a4861c26a
(docs): toh - fix typo; closes #385
2015-11-23 16:24:04 -08:00
a3042849c0
(docs) Tour of Heroes - part 1 & 2. Fix links and make them uniform.
...
closes #375 and #376
2015-11-14 00:28:59 -08:00
e86fde8dc9
chore(jade): upgrade to use `marked` filter
...
The `Transformers.markdown` (`:markdown`) filter is deprecated. This commit updates
the entire docs project to use the `jstransformer-marked` (`:marked') filter.
2015-11-10 18:37:53 +00:00
b8ed367ad6
show the missing selector my-app
2015-10-19 09:41:36 +01:00
Zhimin YE
Filipe Silva
rexebin
Jesús Rodríguez
Zhicheng Wang
Peter Bacon Darwin
Patrice Chalin
Patrice Chalin
Ward Bell
Josh Otis
John Papa
johnapost
Arliang