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
ae35f0e017
docs(lifecycle-hooks): `SimpleChange` -> `SimpleChanges` #2741 ( #2742 )
2016-11-02 21:50:38 -07:00
35d8695752
Removes duplication of head tag in example ( #2648 )
2016-11-02 15:46:29 -07:00
f837330eaf
chore: remove inner editorconfig ( #2736 )
2016-11-02 14:49:51 +01:00
c6cec50a0a
updates to improve search results in Swiftype
2016-11-01 13:40:25 -07:00
8b01b6b8f7
Merge branch 'master' of https://github.com/angular/angular-cn
2016-11-01 10:07:38 +00:00
2ba0cc70f7
fix : #107
2016-11-01 10:07:23 +00:00
9739e14f5f
移除被墙的地址
2016-11-01 10:22:16 +08:00
8a3d061305
docs(router): fix grammar typo in preloader section ( #2700 )
...
tweaks some other related language.
2016-10-31 01:17:27 -07:00
32f3ed973d
docs(router): Fix typos ( #2666 )
2016-10-31 00:55:08 -07:00
e7bcc72610
news(oct30): October 30 updates to news and events
2016-10-31 00:49:53 -07:00
db1df77571
Fixes typo in Router tutorial ( #2688 )
2016-10-31 00:49:14 -07:00
43c9071a2e
docs(cookbook): fix spelling error for word 'class' ( #2682 )
2016-10-31 00:48:22 -07:00
e9d78133e1
docs(testing): revert to jasmine v.2.4.1 ( #2697 )
...
Bug in Jasmine v.2.5.x. Stick with v.2.4.1 (as karma-jasmine does) until the following issue is resolved:
https://github.com/jasmine/jasmine/issues/1231
Unfortunately, there is no `@types/jasmine` for v.2.4 but only for v.2.5.
2016-10-29 23:53:21 -07:00
7e5f5a25ad
docs(testing): fix `base` setting in karma shims ( #2694 )
2016-10-29 19:37:27 -07:00
323becee32
chore: remove bootstrap package ( #2691 )
2016-10-29 10:44:57 -07:00
48cd008749
docs(testing): 'testingService' -> 'twainService' plus clarity ( #2692 )
2016-10-28 12:40:43 -07:00
b99ba401a1
fix : #106
2016-10-28 10:22:35 +01:00
b44cc42f3a
chore: define alt ng2 layout for top-level pages ( #2686 )
2016-10-28 01:08:53 +01:00
c426e57818
fix(e2e): remove invalid syntax usage ( #2687 )
2016-10-28 01:08:43 +01:00
89f1af9807
chore(harp.json): remove unused parameters ( #2681 )
2016-10-28 00:17:40 +01:00
2b9c43471a
fix : #105
2016-10-27 16:53:40 +01:00
44bbc7776a
fix(e2e): fix travis e2e ( #2684 )
...
See angular/webdriver-manager#121
2016-10-27 15:25:09 +01:00
7d142c1d78
docs(vs2015): update for current tools. ( #2672 )
...
closes #2672
2016-10-26 09:26:40 -07:00
06d2f05e41
Merge branch 'master' of https://github.com/angular/angular-cn
2016-10-26 16:52:44 +01:00
d44915f0a7
first review: testing.jade is done.
2016-10-26 16:52:34 +01:00
2408bb149a
fix for #2667 ( #2668 )
...
ported changes made here 541bdc5f63
2016-10-26 08:31:29 -07:00
197be09785
chore(dart): update to 2.0.0 ( #2680 )
2016-10-26 16:36:21 +02:00
68e61f20d8
chore(e2e): re-enable Dart e2e tests ( #2673 )
2016-10-26 15:10:42 +02:00
e9d40ab2d7
Update most visible AngularDart pages to 2.0
2016-10-26 14:43:53 +02:00
4213af39a7
截断文字
2016-10-26 11:37:11 +08:00
54b9e380b5
增加到社区的链接
2016-10-26 11:07:55 +08:00
b1917b800f
chore: remove deprecated liveExample mixins ( #2670 )
...
`+liveExample` mixins were replaced by `<live-example>` directives a
while ago. This cleanup fixes link issues to the plunker under ng2.io.
2016-10-25 20:26:13 +01:00
b58e51a038
docs(router): broken link to DI chapter ( #2662 )
2016-10-25 19:52:44 +02:00
4349c424d6
review: testing 3549
2016-10-25 16:56:10 +01:00
535161225b
review: testing 3543
2016-10-25 16:52:43 +01:00
fb75d67052
review testing line 3480
2016-10-25 16:50:10 +01:00
7893c42b53
review: testin 3463
2016-10-25 16:49:13 +01:00
0957c70caf
review testing 3239
2016-10-25 16:38:16 +01:00
de8efbaf4e
review testing.
2016-10-25 16:14:07 +01:00
e139832320
review testing
2016-10-25 16:08:31 +01:00
7b7487902c
review: testing
2016-10-25 15:32:47 +01:00
d84a1b95dd
review testing
2016-10-25 15:32:30 +01:00
c0cabddd69
fix: routing
2016-10-25 13:09:12 +01:00
79e5dcc3c3
Merge branch 'master' of https://github.com/angular/angular-cn
2016-10-25 12:52:56 +01:00
ee9bae0112
review testing
2016-10-25 12:52:44 +01:00
f64cf9c70a
Merge pull request #103 from Hongbo-Miao/patch-3
...
fix translation mistake
2016-10-25 12:52:20 +01:00
ac674f009b
review： testing 2750
2016-10-25 10:35:58 +01:00
a4d66dfc07
review testing 2644
2016-10-25 10:26:30 +01:00
f6598097c8
Merge branch 'master' of https://github.com/angular/angular-cn
2016-10-25 10:12:31 +01:00
Zhimin YE
Ward Bell
cam73
Filipe Silva
Alex Wolfe
Zhicheng Wang
Aristeidis Bampakos
Naomi Black
katerberg
WilliamKoza
Jesús Rodríguez
Patrice Chalin
Deborah Kurata
Steven
Kathy Walrath
Rex