a59b1b60ee
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/testing.jade
2016-09-23 23:22:42 +01:00
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
9a338b659e
Some more cleanup
2016-09-21 16:11:12 +02:00
8a4a80033e
Fix up styles after sync
2016-09-21 15:32:11 +02:00
693f6ae462
chore: rename Angular 2 to simply Angular ( #2402 )
2016-09-19 20:24:40 -07:00
b9b5c7bd64
fix: 首页图标bug
...
review: ngmodule to line 1821
2016-09-17 19:35:22 +01:00
ba3152bb88
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/_includes/_hero-home.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/guide/style-guide.jade
2016-09-17 12:01:41 +08:00
9fc14a95a8
some touches to banner and api docs
2016-09-16 16:28:41 -07:00
a0dbeee18a
banner(scrolling): add scrolling to the banner
2016-09-16 15:58:20 -07:00
f4c4aee706
initial commit for rotating announcement banner
2016-09-16 15:58:20 -07:00
a4d26e0797
Merge remote-tracking branch 'origin/master'
2016-09-16 08:04:09 +08:00
e56bae4a8c
fix: fix broken anchors
2016-09-15 12:18:31 -07:00
e693d35fb1
合并了最新更新，翻译了官方的发布声明
2016-09-15 17:08:17 +08:00
2417245114
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/_data.json
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_hero.jade
# public/_includes/_main-nav.jade
# public/_includes/_util-fns.jade
# public/docs/_includes/_side-nav.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.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/ngmodule.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/style-guide.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/testing/_data.json
# public/docs/ts/latest/testing/application-under-test.jade
# public/docs/ts/latest/testing/first-app-tests.jade
# public/docs/ts/latest/testing/index.jade
# public/docs/ts/latest/testing/jasmine-testing-101.jade
# public/docs/ts/latest/testing/testing-an-angular-pipe.jade
# public/index.jade
# public/resources/css/main.scss
# public/resources/css/module/_side-nav.scss
2016-09-15 15:23:48 +08:00
8730d62995
docs(release): announce 2.0 final
2016-09-14 19:58:43 -07:00
095a36f903
docs(refresh): late bio add and livestream banner
2016-09-14 18:27:02 -07:00
65db6b9268
design(style): Restyle changes from Alex
2016-09-14 17:18:55 -07:00
1646c45d67
update conference links - add ng-europe; remove AngularConnect
2016-09-12 17:54:46 -07:00
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
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
a039c046c5
修改备案号格式
2016-08-28 06:37:16 +08:00
1d44511bb4
增加备案号
2016-08-27 07:57:43 +08:00
5b8df3494a
chore: add embedded plunkers functionality ( #2194 )
2016-08-25 10:44:22 -07:00
0a45a47c73
docs(api): fix cross-language dropdown menu ( #2187 )
...
- Re-enable dropdown on main API page.
- Remove Dart choice from TS & JS API entry pages dropdown.
2016-08-24 14:48:23 -07:00
19c46899d0
fix: banner for angularconnect
2016-08-24 17:00:20 +01:00
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
0c0c6f69f3
docs(toh-5): TS/Dart review, and Dart resync ( #2115 )
...
* docs(toh-5): review and update/resync Dart
**NOTE: run `gulp add-example-boilerplate` after pulling in the
commit.**
This is preparatory work for #2035 .
As part of the the chapter review, the Dart .jade was enhanced to use
Jade extends (#2018 ).
By the same token it contributed to a post-RC5 resync (#2077 ). Other
key changes:
Dart and TS code:
- Eliminated `styles.1.css` in favor of docregions in `styles.css`.
- `docregion` tags renamed in a few places.
- **No other code changes**.
TS prose
- Fixed: misnamed variable `routing` -> `appRoutes`.
- All other changes are **minor copy edits**, or changes to support
Dart via Jade extends.
Diff of generated HTML for TS chapter was inspected to ensure only
minor copy edits prevailed (i.e., that the support for Jade extends had
no impact on the generated HTML).
* docs(toh-5): edits after doing tutorial
- Some adjustments following actually doing the tutorial. In some cases code shown (e.g. this is what file foo should look like now) didn't match what the user would have. E.g., lingering @Input on the hero property.
- Fixed some lingering deprecated-router prose elements on TS side (e.g., still referring to a route by the old string names like `HeroDetail`).
- Added extra step to `app.component.ts` creation rather than having a critical-call-out later on.
- Reorder some prose for better harmony between TS and Dart prose (also improves the flow).
- Moved the `styleUrls` call-out to the point of first use.
* post-review changes
* more post-review changes
* toh-6 cache update
2016-08-17 13:31:40 -07:00
ea457825b8
docs(router): fix markdown, and example mixin cleanup ( #2101 )
...
* docs(router): fix markdown and example mixin cleanup
- Fixed: markdown text not under `:marked` region (and so that text was
not showing up in the generated html).
- Fixed: code excerpt title `constructor` -> `isSelected`.
- Cleanup of all makeExample mixin uses.
This cleanup will help make it easier to record differences with the
deprecated router chapter (which must have app-relative makeExample
paths).
* post-review updates
Found another instance of markdown (a heading) outside of a `:marked` region.
2016-08-12 11:20:44 -07:00
19d06061c5
docs(quickstart): post-RC5 Dart resync ( #2078 )
...
* docs(quickstart): post-RC5 Dart resync
- Resync Dart QS prose with TS, post RC5.
- Added to-be-shared Jade `var` definitions to `_util-fns.jade`.
- Delete cached QS jade file.
- Eliminate the stub file `styles.1.css` in favor of a `docregion` in
the main `styles.css`.
This commit requires a `gulp add-example-boilerplate` after pulling it in.
Contributes to #2077 .
* post-review edits
2016-08-10 13:32:07 -07:00
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
22a3704947
chore: update next-item for hidden
...
closes #2032
2016-08-05 17:04:57 -07:00
60a06e51b9
Merge remote-tracking branch 'angular.io/master'
...
# Conflicts:
# README.md
# public/_includes/_hero-home.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-01 09:52:29 +01:00
68c9561dec
banner(angularconnect): add an ac promo to the banner
2016-07-29 15:23:03 -07:00
e140256358
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
2016-07-17 20:40:12 +08:00
1bef20abc4
docs(api/dart): add support for generation and display ( #1888 )
...
Fixes #1880 .
Supersedes #1593 .
2016-07-15 14:10:12 -07:00
d7ece5f4b7
chore: hide the english toggle link until angular is loaded
2016-07-15 17:58:01 +02:00
5da6dff3ec
launch(chinese): update the banner translation
2016-07-11 23:03:01 -07:00
be23e90095
launch(china): announce angular.cn
2016-07-11 22:45:23 -07:00
47eb31ddb2
移除banner中的切换中英文提示
2016-07-12 13:05:48 +08:00
01dc30eb3e
chore: Change toggle button text to English.
...
Add "Click to show/hide English" to home.
2016-07-08 09:47:55 +01:00
ba245134a7
更换跟踪ID
2016-07-07 09:50:10 +08:00
1cb52fe7a0
加回Google分析代码
2016-07-07 09:40:38 +08:00
0303a18020
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/structural-directives.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/testing/testing-an-angular-pipe.jade
# public/docs/ts/latest/tutorial/index.jade
# public/docs/ts/latest/tutorial/toh-pt1.jade
# public/docs/ts/latest/tutorial/toh-pt2.jade
# public/docs/ts/latest/tutorial/toh-pt3.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-07-07 08:15:51 +08:00
b0e0d94b5c
docs: revert Jade to markdown
...
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
2016-07-05 23:03:30 -07:00
78fb5708de
英文版改为English
2016-07-03 16:23:10 +08:00
d7a0458484
把到风格指南的链接改成绝对路径
...
文字微调
2016-07-02 22:45:30 +08:00
541eeedcec
修改了导航结构，放上了Naomi的致辞
2016-07-02 21:16:06 +08:00
3c5a045633
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/ts/latest/guide/router.jade
2016-07-02 19:16:00 +08:00
f3da5c8a36
chinese(url): small change to url in footer
2016-07-01 19:21:36 -07:00
527fe50b88
footer(china): update the footer for localised docs
2016-07-01 13:41:06 -07:00
rexebin
Jacob Müller
Jesús Rodríguez
Zhicheng Wang
Alex Wolfe
Filipe Silva
Naomi Black
Katiuska Gamero
Patrice Chalin
Patrice Chalin