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
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
80a311f05e
fix footer link and quickstart title.
2016-11-24 10:27:01 +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
a1bc22b595
events(nov): updates to the events and hero bar
2016-11-22 15:12:17 -08:00
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +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
8ccc33e6ff
[WIP] docs(quickstart): QuickStart reboot ( #2762 )
2016-11-21 17:13:21 -08:00
2026e5026d
docs: fix remaining broken links ( #2832 )
...
* docs: fix remaining broken links In particular, don’t show the language dropdown for the docs change-log page (since JS and Dart don’t have a change log). Together with #2830 , this fixes #2150
* ignore invalid link from about bios
2016-11-18 21:24:35 -08:00
2d3836c8c1
docs(cache): misc adjustments for Dart ( #2830 )
...
* docs(cache): misc adjustments for Dart
Dart cache adjustments:
- Add guide/index (it was being inherited directly from latest before).
- Add proper cache of `_quickstart_repo.jade` (it used to be just an
include).
Also:
- In `_quickstart_repo.jade` use variable set to URL of repo.
- Fix newly added link to Quickstart in guide/index.jade.
* dart/displaying-data: just use TS's _quickstart_repo
2016-11-18 22:55:21 +00:00
1c2d14a8b8
docs(guide & api): feedback/issue links for Dart should refer to Dart repos ( #2821 )
...
* docs(guide/index): feedback link to Dart repo for Dart
- Also added links to chapters mentioned in table.
- Other minor copyedits.
* docs(api): issue links should refer to Dart repo
* post-review updates
* add link to Advance and Guide chapters
* ensure that we can determine which language is active
2016-11-17 16:53:28 -08:00
e0aecb39d9
docs(struct-directives): update Dart cache ( #2806 )
...
Only minor prose edits in this PR. No net change in the generated HTML
for the TS side.
2016-11-15 15:38:02 -08:00
a423a5abc7
clicking on Books & Training sends user to Education ( #2701 )
...
When user clicks in Books & Training item in footer the website should take them to Education section (anchor) in the middle of the page, not to the top where Development section is.
2016-11-14 10:39:46 -08:00
2aa5e71df4
Merge remote-tracking branch 'remotes/angular.io/master' into merge-review-rex
...
# Conflicts:
# public/_includes/_hero-home.jade
2016-11-05 14:24:01 +00:00
5c46ddf7a7
Merge remote-tracking branch 'remotes/angular.io/master' into merge-review-rex
...
# Conflicts:
# public/_includes/_hero-home.jade
2016-11-05 14:23:51 +00:00
7d5e2cf412
Merge remote-tracking branch 'angular.io/master' into merge-review-rex
...
# Conflicts:
# public/docs/ts/latest/tutorial/toh-pt5.jade
2016-11-05 14:08:21 +00:00
6714e171c8
banner(china): announce gdd china events
2016-11-05 02:16:07 -07:00
f42cc68544
修正缩进
2016-11-04 10:28:07 +08:00
c4797bd8f4
增加GDD通知
2016-11-04 10:14:02 +08:00
23984f8caf
fix few compiling errors(live examples)
2016-11-03 15:52:05 +00:00
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
c6cec50a0a
updates to improve search results in Swiftype
2016-11-01 13:40:25 -07:00
9739e14f5f
移除被墙的地址
2016-11-01 10:22:16 +08:00
e7bcc72610
news(oct30): October 30 updates to news and events
2016-10-31 00:49:53 -07:00
4213af39a7
截断文字
2016-10-26 11:37:11 +08:00
54b9e380b5
增加到社区的链接
2016-10-26 11:07:55 +08:00
c85e2156b1
改回本地的跟踪代码
2016-10-25 10:13:47 +08:00
ffe996ee22
Merge branch 'master' of https://github.com/angular/angular-cn
2016-10-22 11:52:28 +01:00
53f0effb8d
fix : #101
2016-10-22 11:52:12 +01:00
09c08779f2
移除了twitter库，它被墙了
2016-10-21 10:15:29 +08:00
e4a74dbff8
fix: banner
2016-10-18 09:48:37 +01:00
ce3930b2c0
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# harp.json
# public/_includes/_hero-home.jade
# public/_includes/_scripts-include.jade
# public/docs/_examples/quickstart/js/package.1.json
# public/docs/_includes/_side-nav.jade
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/api/_data.json
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/ngmodule-faq.jade
# public/docs/ts/latest/cookbook/rc4-to-rc5.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/browser-support.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/ngmodule.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/upgrade.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/_data.json
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
2016-10-17 22:48:18 +01:00
a44c5ea685
removed navigation when only once announcement is present
2016-10-14 22:46:18 -07:00
3aaf722f71
banner(typo): fix capitalization in the banner
2016-10-14 19:06:07 -07:00
1dedfd5301
news(update): updates to news and banner for oct
2016-10-14 19:03:56 -07:00
5732b07423
Upgrade swiftype to 2.0 library and added a results page for searches
2016-10-12 10:01:19 -07:00
6f804c6534
reverting changes to swyftype 2.0 library, fixes breaking change
2016-10-11 13:40:29 -07:00
37af86f6cf
search(usev2): use v2 of swiftype
2016-10-06 12:42:33 -07:00
db6625eb30
Fix dartdoc styles and prep layout for ng2 pages ( #2530 )
...
- Use custom bootstrap grid system styles
- Cache a copy of the dartdoc static-assets styles.css w/ footer styles
disabled.
- Alternate page layout controlled by jade2ng harp global
2016-10-03 14:58:50 -07:00
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
rexebin
Patrice Chalin
Naomi Black
Yang Lin
Ward Bell
ikilled
Zhicheng Wang
Zhimin YE
Alex Wolfe
Jacob Müller
Jesús Rodríguez