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
Patrice Chalin
a4f0a32c3a
examples(styles): remove duplicate items classes ( #2877 )
...
Supersedes #2872 but ensures that we don’t loose `.items li.selected`.
2016-11-26 17:18:22 +00:00
Rex
70606848cc
Merge pull request #140 from todoubaba/dependency-injection
...
Polish dependency-injection.jade
2016-11-26 17:14:55 +00:00
Yang Lin
72c22e17cc
Merge pull request #2 from angular/dependency-injection-rex
...
review di.
2016-11-27 01:14:29 +08:00
rexebin
6c0606469d
review di.
2016-11-26 17:11:47 +00:00
Yang Lin
13ed4d265e
More whitespaces
2016-11-27 00:48:54 +08:00
Yang Lin
1aeb6b9c82
Polish dependency-injection.jade
2016-11-27 00:30:27 +08:00
Rex
11ed7f1cae
Merge pull request #139 from angular/fix-api-display
...
fix api display
2016-11-26 14:54:57 +00:00
Rex YE
d9c651fa47
fix api display
2016-11-26 14:53:33 +00:00
Rex
3cf128ef14
Merge pull request #138 from angular/fix-api-display
...
fix api main footer
2016-11-26 14:27:15 +00:00
Rex YE
dfe65b3ddb
fix api main footer
2016-11-26 14:26:29 +00:00
Rex
e9c8f03340
Merge pull request #137 from angular/fix-api-display
...
fix api display
2016-11-26 14:22:20 +00:00
Rex YE
7ade0e9595
fix api display
2016-11-26 14:18:37 +00:00
Patrice Chalin
891846f232
chore(gulp): selectively shred guide examples using --filter ( #2876 )
...
E.g., `gulp _shred-devguide-examples --filter=dep`
Also removed docs/README.md since it was reporting something that is no
longer true (we don’t commit `_fragments` anymore).
2016-11-26 14:03:01 +00:00
Rex
d7318fe640
Merge pull request #129 from todoubaba/user-input
...
Polish user-input.jade
2016-11-26 13:52:28 +00:00
Rex
8d84f0377d
Merge pull request #128 from todoubaba/displaying-data
...
Polish displaying-data.jade
2016-11-26 13:52:19 +00:00
Rex
87d0edc599
Merge pull request #136 from todoubaba/forms
...
Polish forms.jade
2016-11-26 13:50:49 +00:00
Patrice Chalin
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
Yang Lin
121e760fc5
删除不必要的“我们”和“一个”
2016-11-26 14:29:09 +08:00
gc
cfce91142c
docs(style-guide): fix file structure ( #2873 )
2016-11-25 21:51:51 +01:00
Yang Lin
2b3c8e5a64
Polish forms.jade
2016-11-26 03:16:06 +08:00
Zhicheng Wang
74a2657e04
把小抄的历史版本加入版本控制中，以便识别改动
...
把小抄同步到最新版本
2016-11-25 23:00:01 +08:00
Zhicheng Wang
0c750febfb
解决小抄页无法显示的问题
2016-11-25 22:35:40 +08:00
Yang Lin
75a762a8c5
删除“一个”
2016-11-25 09:03:06 +08:00
rexebin
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
rexebin
754e11dc13
fix styleguide
2016-11-24 21:46:21 +00:00
rexebin
b1f7a6950c
fix addSpacingBetweenCNAndEn
2016-11-24 21:15:22 +00:00
rexebin
d913092f99
add addSpacingBetweenCnAndEn
2016-11-24 20:42:38 +00:00
rexebin
b5486dff72
fix code tag and IsPureEnglish
2016-11-24 19:55:45 +00:00
Rex
f6eeb79d28
Merge pull request #132 from todoubaba/author
...
Update authors
2016-11-24 19:40:08 +00:00
Rex
89195ee681
Merge pull request #131 from todoubaba/translate
...
Processing sibling with children only
2016-11-24 19:39:56 +00:00
Yang Lin
dfd49c01a5
Update authors
2016-11-25 03:05:31 +08:00
Yang Lin
2fe21c9f42
Fixes more
2016-11-25 02:38:54 +08:00
Yang Lin
684d78cca0
Process sibling with children only
2016-11-25 02:23:06 +08:00
Rex
aaa052b13c
Merge pull request #130 from todoubaba/translate
...
Fixes translate.js
2016-11-24 18:08:00 +00:00
Yang Lin
b44055b186
Fixes typo
2016-11-25 02:06:25 +08:00
Yang Lin
f1c1c089d2
Process all siblings
2016-11-25 01:59:39 +08:00
Yang Lin
20129e39d5
Fixes count
2016-11-25 01:50:59 +08:00
Yang Lin
ab5bc95df3
Fixes more
2016-11-25 01:42:21 +08:00
Yang Lin
14eb352ec5
Merge remote-tracking branch 'upstream/master' into translate
2016-11-25 01:34:38 +08:00
Yang Lin
ebad4e1d1b
Fixes translate.js
2016-11-25 01:15:27 +08:00
Rex YE
965645a588
fix quickstart
2016-11-24 15:25:47 +00:00
Rex YE
13d24316a5
li issues
2016-11-24 14:54:49 +00:00
Yang Lin
07f617e413
Polish user-input.jade
2016-11-24 22:46:56 +08:00
Rex YE
cf32bc26c8
fix a few translate.js bugs.
2016-11-24 14:16:23 +00:00
Yang Lin
692c63155f
Restore white space in English
2016-11-24 20:54:22 +08:00
Yang Lin
bc235b05ea
Polish displaying-data.jade
2016-11-24 20:49:31 +08:00
