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
61a5a227b0
merge: server-communication
2016-11-04 16:12:31 +00:00
eb6eae8390
patch visual-studio
2016-11-04 14:05:32 +00:00
89d33384ff
sync visual-studio cookbook
2016-11-04 13:27:00 +00:00
93f08c3723
minor fixes for dynamic forms,
...
form-validation
upgrade
2016-11-04 12:41:10 +00:00
e4c327c2d1
translate: security.jade, new reworded part.
2016-11-04 12:01:01 +00:00
f42cc68544
修正缩进
2016-11-04 10:28:07 +08:00
c4797bd8f4
增加GDD通知
2016-11-04 10:14:02 +08:00
de3b5cd6ce
translate: router - pre-loading...
2016-11-03 22:44:27 +00:00
85b0863bdd
fix minor issues with router.jade.
2016-11-03 21:11:24 +00:00
ac2275dbe6
fix: browser-support table.
2016-11-03 21:02:08 +00:00
0c72fbe444
review: style-guide
2016-11-03 20:53:31 +00:00
47d646a080
补齐: template-syntax.jade
2016-11-03 20:40:39 +00:00
f34e73eb8d
Patch: template-syntax's new contents.
2016-11-03 18:12:44 +00:00
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
b1aae7f306
fix template-syntax comments
2016-11-03 16:54:53 +00:00
d398150573
翻译变更记录。
2016-11-03 16:41:27 +00:00
23984f8caf
fix few compiling errors(live examples)
2016-11-03 15:52:05 +00:00
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
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
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
rexebin
Zhicheng Wang
Ward Bell
Zhimin YE
cam73
Filipe Silva
Alex Wolfe
Aristeidis Bampakos
Naomi Black
katerberg
WilliamKoza
Jesús Rodríguez
Patrice Chalin
Deborah Kurata
Steven
Kathy Walrath