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 |
|
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 |
|
Zhicheng Wang
|
78418f4d3c
|
调整additional的翻译
|
2016-10-06 19:38:32 +08: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 |
|
Jesús Rodríguez
|
693f6ae462
|
chore: rename Angular 2 to simply Angular (#2402)
|
2016-09-19 20:24:40 -07:00 |
|
Zhicheng Wang
|
2a1c3626c5
|
去掉了大部分儿化音
感谢来自github的iloveyo123u1和Elderry
|
2016-09-12 08:35:02 +08:00 |
|
Zhicheng Wang
|
8a7165acf5
|
对上次的合并查漏补缺
|
2016-09-10 20:44:57 +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 |
|
Patrice Chalin
|
59f6ebe849
|
docs(*): misc fixes to prose in support of jade2ng (#2266)
Fixes to prose “syntax”. Anomalies detected by jade2ng.
Also updated the main _utils-fn.jade in support of jade2ng as well.
|
2016-09-06 10:28:24 -07:00 |
|
Jesús Rodríguez
|
9ec4cbf3a4
|
docs(component-relative): tweak webpack explanation
closes #2157
Fixes #2156
|
2016-08-24 23:40:52 -07:00 |
|
Zhimin YE (Rex)
|
654030f09d
|
Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/user-input.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt2.jade
# public/docs/ts/latest/tutorial/toh-pt4.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
|
2016-08-23 14:02:54 +01:00 |
|
Jesús Rodríguez
|
66a36bea05
|
docs(webpack): update testing for RC5
closes #2133
|
2016-08-17 15:44:37 -07:00 |
|
Zhicheng Wang
|
94aa3664ab
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .gitignore
# public/docs/_examples/cb-component-communication/ts/app/app.component.ts
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.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/architecture.jade
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/quickstart.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
|
2016-08-12 07:57:51 +08:00 |
|
Peter Bacon Darwin
|
d79adb2422
|
docs(rc5): update docs and plunkers for rc5
|
2016-08-09 11:48:07 -07:00 |
|
Zhicheng Wang
|
273a0fd1e8
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# public/docs/ts/latest/guide/displaying-data.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/webpack.jade
|
2016-07-11 08:32:56 +08:00 |
|
Zhicheng Wang
|
6264d3bcde
|
批量把Provider/provide改译为提供商/提供,以和ISP(互联网服务提供商)的译法看齐
|
2016-07-07 08:22:36 +08:00 |
|
Foxandxss
|
341f32d7f6
|
docs(webpack): add angular2-template-loader
closes #1825
|
2016-07-05 23:25:07 -07:00 |
|
Zhicheng Wang
|
1fa1d0fd1e
|
Webpack二审完毕
|
2016-06-18 15:01:08 +08:00 |
|
Zhicheng Wang
|
bc2e4b83c0
|
把所有全角括号改成了半角的
|
2016-06-14 09:26:54 +08:00 |
|
Zhimin YE (Rex)
|
8867357e73
|
webpack.jade review is done.
|
2016-06-07 13:43:15 +01:00 |
|
Zhicheng Wang
|
05f4c9b8a0
|
微调
|
2016-06-02 18:59:15 +08:00 |
|
Zhicheng Wang
|
0a917a99c4
|
微调
|
2016-06-02 15:17:55 +08:00 |
|
Zhimin YE (Rex)
|
72efc8f055
|
Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
# README.md
# public/contribute.jade
# public/docs/_examples/cb-component-communication/e2e-spec.ts
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/npm-packages.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
|
2016-06-01 09:51:27 +01:00 |
|
Vikash
|
8569479423
|
docs: fix numerous typos in many doc files.
closes #1509
|
2016-06-01 01:08:56 -07:00 |
|
Zhicheng Wang
|
20bf6c0085
|
翻译完了“升级”一章的新增部分
合并了测试索引
解决了移动设备上菜单显示不全的问题
文字微调
|
2016-05-31 12:35:37 +08:00 |
|
Zhicheng Wang
|
8676cef5af
|
开发指南-webpack 初译完毕
|
2016-05-29 22:46:41 +08:00 |
|
Ramzi Samman
|
feec37b784
|
docs(webpack): fix a typo in the dev guide
closes #1431
|
2016-05-19 19:24:29 -07:00 |
|
Foxandxss
|
0c49b50cbe
|
docs(webpack): fix tests sourcemaps / clarify logo image download
closes #1399, 1395
|
2016-05-15 16:08:38 -07:00 |
|
escardin
|
aa65f0cf44
|
docs(webpack) missing word
|
2016-05-13 14:07:57 -07:00 |
|
Foxandxss
|
81a87c2bfb
|
docs(webpack): remove barrel
closes #1389
|
2016-05-13 14:05:20 -07:00 |
|
Ward Bell
|
9b27bfb61e
|
docs(webpack): checkin missing snippets; .js->.ts
closes #1375
|
2016-05-12 18:18:21 -07:00 |
|
Foxandxss
|
96238bbfab
|
docs(cb-webpack): add guide chapter about webpack
|
2016-05-12 17:22:14 -07:00 |
|