Commit Graph

3428 Commits

Author SHA1 Message Date
Rex fcb4cba416 Merge pull request #155 from todoubaba/fix-code-style
Code 使用与英文相同的等宽字体,与code-example保持一致
2016-11-30 11:29:20 +00:00
Rex 0b349706a4 Merge pull request #154 from todoubaba/architecture
Polish architecture.jade (round 2)
2016-11-30 11:28:37 +00:00
Yang Lin f134cdc2a4 Code 使用与英文相同的等宽字体,与code-example保持一致 2016-11-30 19:26:19 +08:00
Yang Lin 05062c375d Polish architecture.jade (round 2) 2016-11-30 19:12:57 +08:00
Rex 4e614daa93 Merge pull request #150 from todoubaba/glossary
Polish glossary.jade
2016-11-30 10:02:09 +00:00
Rex 508e255930 Merge pull request #151 from todoubaba/guild-index
Polish guild/index.jade (round 2)
2016-11-30 08:03:48 +00:00
Rex d1ba60b78d Merge pull request #152 from todoubaba/setup
Polish setup.jade (round 2)
2016-11-30 08:02:38 +00:00
Rex e74acdcbc1 Merge pull request #153 from todoubaba/learning-angular
Polish learning-angular.jade (round 2)
2016-11-30 08:01:35 +00:00
Yang Lin 510b9051ed Polish learning-angular.jade (round 2) 2016-11-30 12:01:31 +08:00
Yang Lin 69a1dbb993 Polish setup.jade (round 2) 2016-11-30 11:47:27 +08:00
Yang Lin ce9430b8e2 Polish guild/index.jade (round 2) 2016-11-30 11:10:53 +08:00
Yang Lin c57047aad1 Polish glossary.jade 2016-11-30 02:32:36 +08:00
Rex YE 4f1ac69d6d fix: style-guide link 2016-11-29 15:42:39 +00:00
Rex 2bdb81cbaa Merge pull request #149 from todoubaba/style-guide
Polish style-guild.jade
2016-11-29 15:37:52 +00:00
Yang Lin 39512ebcda 使用“例如” 2016-11-29 23:36:27 +08:00
Yang Lin 3b13471cb4 Polish style-guild.jade 2 2016-11-29 21:52:54 +08:00
Yang Lin 4ca4a0a9f6 Polish style-guild.jade 2016-11-29 19:02:21 +08:00
Rex 7d96eecccd Merge pull request #148 from todoubaba/ts-to-js
[trans] ts-to-js.jade
2016-11-28 19:36:26 +00:00
Yang Lin 93c5264841 [trans] ts-to-js.jade 2016-11-29 03:17:28 +08:00
Rex YE a005f250b0 fix: #146 2016-11-28 13:52:45 +00:00
Rex YE f6f570dfc0 fix: #144 2016-11-28 13:49:28 +00:00
Rex YE 2b5da24d94 fix: #145 2016-11-28 13:47:14 +00:00
Rex YE 55c14576be review learning-angular 2016-11-28 09:39:41 +00:00
Rex YE 9e5392c663 review setup 2016-11-28 09:34:35 +00:00
Rex YE f1896230b2 review quickstart. 2016-11-28 09:19:26 +00:00
rexebin a685691348 Merge remote-tracking branch 'todoubaba/template-syntax'
# Conflicts:
#	public/docs/ts/latest/guide/template-syntax.jade
2016-11-27 20:27:16 +00:00
Rex 798d3f9216 Merge pull request #141 from dusthub/master
fix translation repeated
2016-11-27 20:14:00 +00:00
Rex 12bb596cd6 Merge pull request #143 from angular/merge-26-11-16
Merge official doc updates -  26/11/2016
2016-11-27 20:07:54 +00:00
rexebin 1b38b5b200 translate: setup-systemjs-anatomy.jade. 2016-11-27 20:04:21 +00:00
rexebin b01dc2c2f0 fix: menu 2016-11-27 18:22:27 +00:00
rexebin 9a9fef17eb fix: component-communication 2016-11-27 18:20:39 +00:00
rexebin 5617821cf9 fix: aot-compiler and toh-pt6 2016-11-27 18:14:44 +00:00
Yang Lin f04801fe03 template-syntax.jade 2016-11-28 02:09:25 +08:00
rexebin 733d702874 fix: template-syntax.jade form 2016-11-27 17:56:17 +00:00
rexebin a67bac604a fix: guide/user-inpurt 2016-11-27 17:50:27 +00:00
rexebin 1a3182e759 translate: guide/appmodule 2016-11-27 16:42:03 +00:00
rexebin 2e2af20877 translate: learning-angular.jade 2016-11-27 14:50:39 +00:00
rexebin edc9d32e97 translate: guide/setup.jade 2016-11-27 13:24:24 +00:00
rexebin e7caa4d947 Merge branch 'master' into merge-26-11-16
# Conflicts:
#	public/translate/cn/translate.js
2016-11-27 11:41:50 +00:00
rexebin 9e92f38e7e fix:
1. not yet translated articles
2. pure english in th and td.
2016-11-27 11:39:31 +00:00
rexebin 3b5d85c524 fix pure english bugs. 2016-11-27 11:00:11 +00:00
rexebin 1f95c12471 fix translate.js pure english. 2016-11-27 10:59:31 +00:00
rexebin afc17dce11 快速开始 -> 快速起步 2016-11-27 10:41:55 +00:00
rexebin 26100f95f6 搭建 -> 搭建本地开发环境 2016-11-27 10:38:15 +00:00
rexebin 0945f5ddce translate: guide/_data.json 2016-11-27 10:28:32 +00:00
Rex YE 1b3f40425d translate: quickstart and guide/index 2016-11-27 09:37:30 +00:00
dusthub f38478893a fix translation repeated 2016-11-27 15:58:08 +08:00
rexebin d3b8683c3d Merge remote-tracking branch 'angular.io/master' into merge-26-11-16
# Conflicts:
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_next-item.jade
#	public/_includes/_version-dropdown.jade
#	public/docs/index.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/_quickstart_repo.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/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
2016-11-26 21:53:28 +00:00
rexebin 3c1d528a1c merge 2016-11-26 21:44:27 +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