Rex
|
9161d9c57e
|
Merge pull request #167 from todoubaba/toh-pt6
Polish toh-pt6.jade (round 2)
|
2016-12-02 14:22:25 +00:00 |
|
Rex
|
4a7374b476
|
Merge pull request #166 from todoubaba/toh-pt5
Polish toh-pt5.jade (round 2)
|
2016-12-02 14:22:19 +00:00 |
|
Yang Lin
|
4e49ba9cd0
|
Polish toh-pt6.jade (round 2)
|
2016-12-02 10:56:05 +08:00 |
|
Yang Lin
|
c61f5e7097
|
Polish toh-pt5.jade (round 2)
|
2016-12-02 10:28:26 +08:00 |
|
Rex
|
e56cca9c79
|
Merge pull request #165 from todoubaba/toh-pt4
Polish toh-pt4.jade (round 2)
|
2016-12-01 21:17:10 +00:00 |
|
Yang Lin
|
17ddd8817e
|
Polish toh-pt4.jade (round 2)
|
2016-12-02 02:15:34 +08:00 |
|
Rex
|
f6febe222b
|
Merge pull request #164 from todoubaba/toh-pt3
Polish top-pt3.jade (round 2)
|
2016-12-01 17:35:55 +00:00 |
|
Yang Lin
|
445890b107
|
Polish top-pt3.jade (round 2)
|
2016-12-02 01:20:13 +08:00 |
|
Rex
|
8e2bac0086
|
Merge pull request #163 from todoubaba/toh-pt2
Polish toh-pt2.jade (round 2)
|
2016-12-01 16:05:49 +00:00 |
|
Yang Lin
|
febe110eb0
|
Polish toh-pt2.jade (round 2)
|
2016-12-01 21:54:35 +08:00 |
|
Rex
|
fdd5836d60
|
Merge pull request #162 from todoubaba/toh-pt1
Polish toh-pt1.jade (round 2)
|
2016-12-01 08:08:43 +00:00 |
|
Rex
|
9fe7173846
|
Merge pull request #161 from todoubaba/toh-index
Polish tutorial/index.jade (round 2)
|
2016-12-01 08:08:03 +00:00 |
|
Yang Lin
|
44a2377b65
|
Polish toh-pt1.jade (round 2)
|
2016-12-01 15:08:04 +08:00 |
|
Yang Lin
|
65ed634c21
|
Polish tutorial/index.jade (round 2)
|
2016-12-01 11:49:52 +08:00 |
|
Yang Lin
|
625ce82a6c
|
Fix all _data.json
|
2016-12-01 10:54:43 +08:00 |
|
rexebin
|
5617821cf9
|
fix: aot-compiler and toh-pt6
|
2016-11-27 18:14:44 +00:00 |
|
rexebin
|
26100f95f6
|
搭建 -> 搭建本地开发环境
|
2016-11-27 10:38:15 +00:00 |
|
rexebin
|
edda524d0d
|
Merge remote-tracking branch 'angular.io/master'
# Conflicts:
# .travis.yml
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_next-item.jade
# public/_includes/_util-fns.jade
# public/_includes/_version-dropdown.jade
# public/docs/_examples/package.json
# public/docs/_examples/quickstart/dart/lib/app_component.dart
# public/docs/_examples/quickstart/e2e-spec.ts
# public/docs/_examples/quickstart/js/app/app.component.js
# public/docs/_examples/quickstart/ts/app/app.component.ts
# public/docs/_examples/quickstart/ts/index.html
# public/docs/_examples/toh-5/dart/lib/dashboard_component.html
# public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
# public/docs/dart/latest/_util-fns.jade
# public/docs/dart/latest/guide/_data.json
# public/docs/dart/latest/guide/index.jade
# public/docs/dart/latest/quickstart.jade
# public/docs/index.jade
# public/docs/js/latest/quickstart.jade
# public/docs/ts/_cache/glossary.jade
# public/docs/ts/_cache/guide/dependency-injection.jade
# public/docs/ts/_cache/guide/index.jade
# public/docs/ts/_cache/quickstart.jade
# public/docs/ts/_cache/tutorial/toh-pt5.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/_quickstart_repo.jade
# public/docs/ts/latest/cli-quickstart.jade
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/dynamic-form.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/browser-support.jade
# public/docs/ts/latest/guide/change-log.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/lifecycle-hooks.jade
# public/docs/ts/latest/guide/ngmodule.jade
# public/docs/ts/latest/guide/npm-packages.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/guide/testing.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/guide/user-input.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/_data.json
# public/docs/ts/latest/tutorial/index.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
# public/events.jade
# public/resources/images/devguide/quickstart/hello-angular.png
# scripts/cache.sh
# tools/plunker-builder/indexHtmlTranslator.js
|
2016-11-26 21:43:16 +00:00 |
|
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 |
|