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 |
|
Jesús Rodríguez
|
693f6ae462
|
chore: rename Angular 2 to simply Angular (#2402)
|
2016-09-19 20:24:40 -07:00 |
|
Zhicheng Wang
|
ab06793705
|
对上次的合并查漏补缺
|
2016-09-10 18:31:38 +08:00 |
|
Zhicheng Wang
|
969da7d321
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# README.md
# public/_includes/_scripts-include.jade
# public/docs/_examples/homepage-hello-world/ts/index.1.html
# public/docs/_examples/homepage-tabs/ts/index.1.html
# public/docs/_examples/homepage-todo/ts/index.1.html
# public/docs/_examples/systemjs.config.plunker.build.js
# public/docs/_examples/systemjs.config.plunker.js
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/cookbook/component-relative-paths.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/dependency-injection.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/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/_data.json
# public/docs/ts/latest/tutorial/toh-pt6.jade
# public/features.jade
# public/resources/js/directives/live-example.js
# tools/plunker-builder/indexHtmlTranslator.js
|
2016-09-08 17:20:01 +08:00 |
|
Jesús Rodríguez
|
9ec4cbf3a4
|
docs(component-relative): tweak webpack explanation
closes #2157
Fixes #2156
|
2016-08-24 23:40:52 -07:00 |
|
Zhicheng Wang
|
d034bc33c8
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/contribute.jade
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/cookbook/component-relative-paths.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/forms.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/user-input.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
|
2016-08-06 19:52:08 +08:00 |
|
Brandon Roberts
|
b93fb12fea
|
chore(examples): Updated live example links to use helper directive
closes #2005
|
2016-08-05 16:41:45 -07:00 |
|
Rex
|
77cdd8bde8
|
review all "我们" keyword, making the translations more natural.
|
2016-06-20 10:59:00 +01:00 |
|
Zhicheng Wang
|
bc2e4b83c0
|
把所有全角括号改成了半角的
|
2016-06-14 09:26:54 +08:00 |
|
Zhimin YE (Rex)
|
f694255b7b
|
review of component-relative-paths.jade
|
2016-06-09 14:34:12 +01:00 |
|
Zhimin YE (Rex)
|
8ae3d52cbc
|
minor change to ts-to-js.jade review.
|
2016-06-09 14:18:27 +01:00 |
|
Zhicheng Wang
|
bfc5c70349
|
cookbook - 组件相对路径 初译完毕
cookbook - 1 to 2 初译开始
其它微调
|
2016-06-01 18:34:22 +08:00 |
|
Kyle Roberts
|
4ab05a9355
|
docs(Component relative paths): ofter -> often and colon
closes #1471
|
2016-05-22 19:54:47 -07:00 |
|
Ward Bell
|
e188e472f1
|
docs(e2e-tests): improve gulp e2e tasks and fix samples that were failing
|
2016-05-20 20:33:38 -07:00 |
|
Ward Bell
|
f9fea00824
|
docs(component-relative-paths): new cookbook
|
2016-05-20 20:33:38 -07:00 |
|