Yang Lin
|
121e13b5a1
|
merge 2.2.0
|
2016-11-23 00:22:04 +08:00 |
|
Rex YE
|
b3555bf990
|
fix browser-support, style-guide and toh-pt5
|
2016-11-22 14:54:35 +00:00 |
|
Yang Lin
|
5a7745fb27
|
Upgrade to 2.2.0
|
2016-11-22 20:07:16 +08:00 |
|
Yang Lin
|
f67aee12a9
|
Polish by review
|
2016-11-21 00:39:46 +08:00 |
|
Yang Lin
|
54e9048e46
|
Revert "Polish by review"
This reverts commit bf4e0c49ffb37cc989a4dcca08bd8a6e27fb8f13.
|
2016-11-21 00:30:05 +08:00 |
|
Yang Lin
|
bf4e0c49ff
|
Polish by review
|
2016-11-21 00:22:25 +08:00 |
|
Rex
|
763b1c7566
|
Merge pull request #115 from todoubaba/toh-pt6
Polish toh pt6
|
2016-11-13 19:14:45 +00:00 |
|
rexebin
|
c748e151c8
|
fix: #119
|
2016-11-13 19:06:09 +00:00 |
|
Yang Lin
|
6c9b27996c
|
Polish toh pt6
|
2016-11-06 19:18:18 +08:00 |
|
Yang Lin
|
af0359d199
|
控制台 -> 仪表盘
|
2016-11-06 16:33:53 +08:00 |
|
Yang Lin
|
cf42e8ce7b
|
Promise -> 承诺
|
2016-11-06 16:33:53 +08:00 |
|
Yang Lin
|
b9e72506af
|
Polish toh pt4
|
2016-11-06 16:33:53 +08:00 |
|
Yang Lin
|
ba8503d9b1
|
typo
|
2016-11-06 15:17:58 +08:00 |
|
Yang Lin
|
a934b5993a
|
Polish toh pt5
|
2016-11-06 15:08:57 +08:00 |
|
Yang Lin
|
48fca7a8db
|
polish
|
2016-11-06 11:43:36 +08:00 |
|
Yang Lin
|
a13f19f7d4
|
Polish top pt1
|
2016-11-06 11:43:36 +08:00 |
|
Yang Lin
|
1cd0742230
|
more polish
|
2016-11-06 11:41:49 +08:00 |
|
Yang Lin
|
1586163b0d
|
Polish top pt2
|
2016-11-06 11:41:49 +08:00 |
|
Yang Lin
|
14eed65c12
|
Polish toh pt3
|
2016-11-06 09:41:03 +08:00 |
|
Yang Lin
|
b2e92e4a62
|
polish
|
2016-11-06 09:30:21 +08:00 |
|
Yang Lin
|
9c799a4f41
|
Tutorial index
|
2016-11-06 09:30:21 +08:00 |
|
rexebin
|
48dd29e0d5
|
patch: toh-pt5
|
2016-11-05 14:48:20 +00:00 |
|
rexebin
|
7d5e2cf412
|
Merge remote-tracking branch 'angular.io/master' into merge-review-rex
# Conflicts:
# public/docs/ts/latest/tutorial/toh-pt5.jade
|
2016-11-05 14:08:21 +00:00 |
|
Ward Bell
|
fa99a8b0b2
|
docs(toh-5): dashboard uses [routerLink] bindings #998 (#2718)
* docs(toh-5): dashboard uses [routerLink] bindings #998
closes #998
* chore: temp add toh-5 to bad-code-excerpt-skip-patterns.txt
|
2016-11-03 10:25:01 -07:00 |
|
Zhimin YE
|
23984f8caf
|
fix few compiling errors(live examples)
|
2016-11-03 15:52:05 +00:00 |
|
Zhimin YE
|
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 |
|
katerberg
|
db1df77571
|
Fixes typo in Router tutorial (#2688)
|
2016-10-31 00:49:14 -07:00 |
|
Samuel Marks
|
c746c732aa
|
Typo fix (#2657)
Technically 'nestled' still makes sense in this context, but is a little too Christmas-y! - I assume you meant 'nested' :P
|
2016-10-23 00:52:12 -07:00 |
|
Filipe Silva
|
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 |
|
Zhimin YE
|
fb4aa6a7a0
|
fix: #97
|
2016-10-19 11:06:26 +01:00 |
|
Zhimin YE
|
7fc3e00002
|
fix: #97
|
2016-10-19 11:05:10 +01:00 |
|
Maurice de Beijer
|
e89ba6f075
|
docs(toh-5): fix typo in link (#2622)
.htm => .html
|
2016-10-18 15:14:09 +02:00 |
|
Zhimin YE
|
f6d2b39844
|
fix: toh-pt5
|
2016-10-18 11:58:43 +01:00 |
|
rexebin
|
ce3930b2c0
|
Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
# harp.json
# public/_includes/_hero-home.jade
# public/_includes/_scripts-include.jade
# public/docs/_examples/quickstart/js/package.1.json
# public/docs/_includes/_side-nav.jade
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/api/_data.json
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/ngmodule-faq.jade
# public/docs/ts/latest/cookbook/rc4-to-rc5.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/browser-support.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/ngmodule.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/upgrade.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/_data.json
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
|
2016-10-17 22:48:18 +01:00 |
|
Rex
|
606c656f1b
|
fix: #95
|
2016-10-17 15:22:23 +01:00 |
|
Sebastián Ramírez
|
883a29ecf7
|
Fix minor typo in HTTP guide (#2604)
|
2016-10-14 12:35:28 +02:00 |
|
Jesús Rodríguez
|
e503efe8c8
|
docs(toh5): add moduleId information (#2597)
|
2016-10-13 16:41:57 -07:00 |
|
Sebastián Ramírez
|
4f81a7ee8c
|
docs(toh5): update styles.css link (#2601)
|
2016-10-14 01:12:06 +02:00 |
|
Ward Bell
|
2e17d587de
|
docs(toh-5): add AppRoutingModule (#2584)
|
2016-10-11 16:30:30 -07:00 |
|
SangKa
|
2751b20aae
|
修正 教程 7.Http 翻译问题
|
2016-10-10 06:53:40 +08:00 |
|
Brandon
|
ff118810ff
|
docs(router): Updated routing examples to use routing modules (#2478)
Simplified routing in tutorial example
Updated ngmodule guide and ngmodule faq with routing module prose
|
2016-10-05 14:59:09 -07:00 |
|
Zhimin YE (Rex)
|
b6ff278ac5
|
fix: #86
|
2016-10-03 10:26:22 +01:00 |
|
Zhimin YE (Rex)
|
1523fedcf0
|
Merge remote-tracking branch 'origin/master'
|
2016-09-26 15:15:09 +01:00 |
|
Zhimin YE (Rex)
|
a18aa9ec01
|
Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
# 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/index.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
|
2016-09-26 15:14:39 +01:00 |
|
zhibinr
|
47b3b3dbba
|
修复格式错误
|
2016-09-26 11:13:10 +08:00 |
|
Brandon
|
556e40695a
|
docs(toh): Replaced window.history with location service (#2439)
|
2016-09-25 18:56:12 -07:00 |
|
Ward Bell
|
6def9505cc
|
chore: convert templateUrls to use moduleId where possible. (#2477)
|
2016-09-25 18:51:54 -07:00 |
|
rexebin
|
f7c60a07df
|
fix： change all 他 > 它
|
2016-09-25 19:50:45 +01:00 |
|
rexebin
|
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 |
|
Patrice Chalin
|
b2c6acf1ad
|
docs(tutorial): fix broken link (#2420)
Fixes #2419
|
2016-09-20 10:56:38 -07:00 |
|