26100f95f6
搭建 -> 搭建本地开发环境
2016-11-27 10:38:15 +00:00
0945f5ddce
translate: guide/_data.json
2016-11-27 10:28:32 +00:00
1b3f40425d
translate: quickstart and guide/index
2016-11-27 09:37:30 +00:00
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
3c1d528a1c
merge
2016-11-26 21:44:27 +00:00
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
70606848cc
Merge pull request #140 from todoubaba/dependency-injection
...
Polish dependency-injection.jade
2016-11-26 17:14:55 +00:00
6c0606469d
review di.
2016-11-26 17:11:47 +00:00
13ed4d265e
More whitespaces
2016-11-27 00:48:54 +08:00
1aeb6b9c82
Polish dependency-injection.jade
2016-11-27 00:30:27 +08:00
d9c651fa47
fix api display
2016-11-26 14:53:33 +00:00
d7318fe640
Merge pull request #129 from todoubaba/user-input
...
Polish user-input.jade
2016-11-26 13:52:28 +00:00
8d84f0377d
Merge pull request #128 from todoubaba/displaying-data
...
Polish displaying-data.jade
2016-11-26 13:52:19 +00:00
0902940eeb
docs(dependency-injection): updates to match TS; also minor TS fixes ( #2875 )
...
* cache file sync before making updates to Dart jade
* app.module.ts: fix ngmodule docregion
* [TS] dependency-injection.jade updates
* [Dart] dependency-injection.jade updates
* final ts/_cache file sync
2016-11-26 12:20:54 +00:00
121e760fc5
删除不必要的“我们”和“一个”
2016-11-26 14:29:09 +08:00
cfce91142c
docs(style-guide): fix file structure ( #2873 )
2016-11-25 21:51:51 +01:00
2b3c8e5a64
Polish forms.jade
2016-11-26 03:16:06 +08:00
74a2657e04
把小抄的历史版本加入版本控制中，以便识别改动
...
把小抄同步到最新版本
2016-11-25 23:00:01 +08:00
75a762a8c5
删除“一个”
2016-11-25 09:03:06 +08:00
dedeb6e8ac
disable addSpacing, it has bugs:
...
1. make sub li click event buggy
2. taged chinese has space too.
2016-11-24 22:00:50 +00:00
754e11dc13
fix styleguide
2016-11-24 21:46:21 +00:00
d913092f99
add addSpacingBetweenCnAndEn
2016-11-24 20:42:38 +00:00
b44055b186
Fixes typo
2016-11-25 02:06:25 +08:00
14eb352ec5
Merge remote-tracking branch 'upstream/master' into translate
2016-11-25 01:34:38 +08:00
ebad4e1d1b
Fixes translate.js
2016-11-25 01:15:27 +08:00
965645a588
fix quickstart
2016-11-24 15:25:47 +00:00
07f617e413
Polish user-input.jade
2016-11-24 22:46:56 +08:00
692c63155f
Restore white space in English
2016-11-24 20:54:22 +08:00
bc235b05ea
Polish displaying-data.jade
2016-11-24 20:49:31 +08:00
80a311f05e
fix footer link and quickstart title.
2016-11-24 10:27:01 +00:00
fb97653721
docs(toh-5/6): update Dart to match TS, with minor tweaks to TS ( #2869 )
...
* sync cache before making changes to Dart files
* docs(toh-5): updates for Dart and tweaks for TS
* final sync of toh cache files
2016-11-23 23:42:49 +00:00
f2c815f6d0
docs(glossary): update Dart to match TS, with minor tweaks to TS ( #2868 )
...
* sync cache before changes to Dart
* docs(glossary): Dart updates and TS tweaks
E.g., add AoT and JiT to Dart.
* final refresh of cache file
2016-11-23 23:20:53 +00:00
692d751375
docs: quickstart reboot for Dart ( #2867 )
...
* cache/quickstart sync before making Dart edits
* quickstart updates for Dart
* cache/guide/index sync before making Dart edits
* guide/index updates for Dart
* learning-angular for Dart
* guide/setup for Dart
* refresh cache/tutorial/index
2016-11-23 17:58:21 +00:00
7a651ed873
docs(setup): fix typo ( #2864 )
2016-11-23 13:37:09 +01:00
57413af54c
quickstart(copyedits): copyedits to the QS text for style
2016-11-22 17:44:34 -08:00
9c298a5273
Merge pull request #2854 from IdeaBlade/quickstart-reboot-2
...
docs(quickstart) reboot 2
2016-11-22 15:09:12 -08:00
dde9969a42
docs(cookbook/dynamic_forms): fix a typo ( #2857 )
2016-11-22 22:49:05 +01:00
a288e2c0c4
Merge pull request #118 from todoubaba/guide-architecture
...
Polish guide architecture
2016-11-22 16:52:29 +00:00
24b9d7ab78
merge 2.2.0
2016-11-23 00:46:50 +08:00
121e13b5a1
merge 2.2.0
2016-11-23 00:22:04 +08:00
7f022c153b
fix aot-compiler, router and upgrade
2016-11-22 15:21:36 +00:00
b3555bf990
fix browser-support, style-guide and toh-pt5
2016-11-22 14:54:35 +00:00
1e105bff95
fix guide/index.jade and forms
2016-11-22 14:42:12 +00:00
a13b40442e
fix compile errors.
2016-11-22 14:26:51 +00:00
56228ce571
fix quickstart.jade compile error.
2016-11-22 14:18:53 +00:00
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +08:00
434308ab1b
docs(forms): revise prose for form.reset ( #2853 )
2016-11-21 18:23:28 -08:00
5217f116d9
docs(quickstart): reboot - final review
2016-11-21 17:37:10 -08:00
ec2e6cb2c7
[WIP] docs(quickstart): QuickStart reboot ( #2762 )
2016-11-21 17:36:16 -08:00
a7525721c0
Revert "[WIP] docs(quickstart): QuickStart reboot ( #2762 )"
...
This reverts commit 8ccc33e6ff
2016-11-21 17:29:00 -08:00
rexebin
Yang Lin
Patrice Chalin
gc
Zhicheng Wang
Jesús Rodríguez
Naomi Black
Naomi Black
Jordan Frankfurt
Ward Bell