Commit Graph

40 Commits

Author SHA1 Message Date
Yang Lin 5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08:00
rexebin 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
Jesús Rodríguez 693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
Zhicheng Wang 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
Alex Wolfe 65db6b9268 design(style): Restyle changes from Alex 2016-09-14 17:18:55 -07:00
Zhicheng Wang 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
Patrice Chalin 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
Zhicheng Wang 443f726a04 重新开放dart版
接受网友Z的一个修订意见
2016-06-23 08:05:05 +08:00
Zhimin(Rex) YE 76aed6e600 minor fix on npm-package.jade
uncomment mixin for js docs.
2016-05-27 00:51:01 +01:00
Zhimin(Rex) YE 70f534cc2a removed js/dart languages from dropdown list.
review for displaying-data.jade and index.jade.
2016-05-26 22:52:50 +01:00
Zhicheng Wang b86aa26da9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_includes/_main-nav.jade
#	public/_includes/_version-dropdown.jade
#	public/docs/_includes/_side-nav.jade
2016-04-23 15:13:58 +08:00
alexwolfe 165f6933a6 Fixed shifting content on page load
Fixed shifting content when going from page to page in docs.
2016-04-22 15:49:10 -07:00
Zhicheng Wang 2587cf0105 完成了各种公共页面的汉化 2016-04-13 08:53:17 +08:00
Naomi Black a9cbba4178 bug(versionpicker): fix missing / in commit ee5096f 2016-03-18 01:57:35 -07:00
Peter Bacon Darwin ee5096f916 fix(version-dropdown): allow deeper paths to API pages
This is a horrible hack but it works (for now).
Really this needs to be made generic to cope with any level of path.

Closes #970
2016-03-17 08:09:43 +00:00
Ward Bell 95c34d27bc docs: temporary TS-referencing chapters for gaps in JS/Dart
Also displays styleguide at language level
Fragmented glossary for JS & Dart
2016-03-01 11:22:04 -08:00
Naomi Black 1832ca3253 chore(beta): remove 1.x from version dropdown 2015-12-15 20:08:24 -08:00
Cory Bateman dbb065a7ed refact(app): use recommended `controller as` syntax
Updated site controllers and directives to use controller as syntax

Closes #84
Closes #135
2015-11-15 20:52:35 +00:00
Jay Traband 50e758ba60 improved infrastructure for devguide and revised getting started (TS) 2015-09-10 13:32:57 -07:00
Naomi Black 9169409c21 harp(update): var changes to allow use with harp 0.17.0 2015-07-28 00:14:34 -07:00
Naomi Black c4496c0686 docs(devpreview): Change alpha to developer preview and get rid of .x where feasible
closes #47
2015-04-28 12:33:29 -07:00
Alex Wolfe cf220fed48 fix for nav 2015-04-22 09:51:13 -07:00
Alex Wolfe 22d1e8a9c3 dart updates 2015-04-22 07:49:21 -07:00
Alex Wolfe bbcd5c5993 fixed drop down flash of content bug 2015-03-05 06:30:53 -08:00
Alex Wolfe 700136dd0f drop down logic now switches to page too 2015-03-04 22:00:27 -08:00
Alex Wolfe 628e8494f2 update drop down 2015-03-04 13:57:29 -08:00
Alex Wolfe 85d7ddc515 aria labels and fixes 2015-03-04 13:50:13 -08:00
Naomi Black 5f4886f1e9 Dropdown changes and text consistency 2015-03-04 12:32:15 -07:00
Alex Wolfe 681bb0c067 bug fix 2015-03-04 10:03:49 -08:00
Alex Wolfe b959101963 typo 2015-03-04 07:49:47 -08:00
Alex Wolfe c77e4850f1 drop down update 2015-03-04 05:27:48 -08:00
Alex Wolfe 9c93c2294a dropdown 2015-03-03 14:22:30 -08:00
Alex Wolfe 70aa536e0a base setup for menu 2015-03-03 06:41:37 -08:00
Alex Wolfe cd18967a6e version menu & social icons 2015-03-03 06:34:45 -08:00
Alex Wolfe 20308d21bb drop down update 2015-03-02 22:57:42 -08:00
Alex Wolfe b43daa67ce dropdown initial test 2015-03-02 19:07:47 -08:00
Alex Wolfe cf4cf8503c contribute 2015-03-02 07:15:03 -08:00
Alex Wolfe ee99ae475f bio layout 2015-03-01 23:48:31 -08:00
Alex Wolfe b4d3a06c07 dropdown icon 2015-03-01 15:43:22 -08:00
Alex Wolfe bf1a05881d docs dropdown logice 2015-03-01 06:42:36 -08:00