Commit Graph

592 Commits

Author SHA1 Message Date
Zhicheng Wang f5c85b3e82 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/_includes/_scripts-include.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/docs/ts/latest/cli-quickstart.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	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/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.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/appmodule.jade
#	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/component-styles.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/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/learning-angular.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/pipes.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/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.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/_data.json
#	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
#	public/events.jade
#	public/news.jade
#	public/presskit.jade
2017-04-15 15:34:47 +08:00
William KOZA 252dd5fdf4 docs(structural-directives): <template> was replaced by <ng-template> (#3445) 2017-04-11 19:59:12 -07:00
Ward Bell 914823a47a aio(style-guide): adjust to support migration to aio (#3490) 2017-04-01 15:13:42 -07:00
Tay Yang Shun 6fa6a1d328 fix: misc typos in three files (#3463) 2017-04-01 11:38:49 -07:00
Ward Bell 86628ebabf chore: replace refs to "logos/angular2/" with angular (#3477) 2017-03-31 11:59:16 +02:00
Jesús Rodríguez f7c89d07b1 chore: remove dart remains (#3468) 2017-03-30 16:13:42 -07:00
Ward Bell e2492a289b chore(image): remove Angular 2 form plunker placeholder.png (#3448) 2017-03-28 01:53:19 -07:00
Patrice Chalin 3ba79f9eb5 chore: devguide image compression (#3384) 2017-03-23 11:47:04 -07:00
Jesús Rodríguez e6741efd8f chore: remove moduleId from examples (#3362)
* chore: remove moduleId from examples

* add support for testing and plunkers

* delete component-relative cookbook

* latest touches

* ward teaks and travis fixes

* fix typo in style-guide
2017-03-14 12:30:37 +01:00
Jesús Rodríguez e8a062bdd2 build: zipper revival (#3319) 2017-02-28 23:31:24 +01:00
Zhicheng Wang cb17c8afe3 把Angular 2替换为Angular
把Angular 1替换为AngularJS
2017-02-26 17:12:55 +08:00
Zhicheng Wang 6af595d7bd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/dart/latest/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	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/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.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/appmodule.jade
#	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/component-styles.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/hierarchical-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/pipes.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/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.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/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.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
#	public/events.jade
#	public/presskit.jade
#	public/resources/js/directives/cheatsheet.js
2017-02-26 15:39:42 +08:00
Paul Gschwendtner 2ba5131b9c bio: change avatar for devversion (#3268)
* Replaces the super creppy bio avatar with a less creppy bio avatar.
2017-02-19 21:00:06 -10:00
Jason Aden 32c07c00b9 chore(bios): add bio for Jason Aden (#3249) 2017-02-14 11:55:37 -08:00
Appie 8f8feb2455 fix(banner): Fixes button positioning (#3038) (#3039) 2017-02-08 17:34:06 -08:00
Ward Bell f24b830c8a docs(template-syntax/structural-directives): refresh both guides for style, accuracy, understanding (#3110)
Move details of structural directives from template-syntax to structural-directives guide
Add <ng-container> to structural-directives
Fix samples in both guides
Touch up glossary
Better conformance to google doc guidelines: we->you
closes #2303, #2885
2017-02-06 19:06:13 -08:00
Kapunahele Wong 452c16dce2 docs(reactive-forms): add reactive forms guide (#2835) 2017-01-31 17:36:32 -08:00
Ward Bell 878dfa6b87 docs(presskit): add branding to presskit per S.Fluin (#3153) 2017-01-26 15:47:34 -08:00
Ward Bell de4903be56 chore: Angular 1 -> AngularJS / Angular 2 -> Angular (#3143)
* chore: Angular 1 -> AngularJS / Angular 2 -> Angular

* Jesus' tweaks
2017-01-26 12:26:11 +01:00
Torgeir Helgevold 969f169eb1 docs(cb-dynamic-component-loading): add dynamic component loading cookbook (#2896)
s

s

s

s

s

s

s

s

s

s

s

s

s

s

s
2017-01-25 13:44:17 -10:00
mmalerba 15d9ccb419 docs(team): add mmalerba to about page (#3070)
* Add mmalerba to about page

* fix spelling
2017-01-25 11:30:29 -10:00
Filipe Silva 0143d8f454 feat(cli-quickstart): add updated cli-quickstart (#3112)
* feat(cli-quickstart): add updated cli-quickstart

* incorporate Ward's feedback
2017-01-23 23:44:55 +00:00
Jesús Rodríguez 5b30c684d3 chore: fix plunkers for IE11 (#3095) 2017-01-13 20:56:42 -08:00
Ward Bell 4253378e66 docs(hierarchical-di): Correct avoidance example (#3086) and more (#3091)
* closes #3086
* samples reworked to conform to our sample style, make more sense, and cover the points in prose.
* copy edits to bring closer to Google docs standards.
2017-01-13 13:21:22 -08:00
Filipe Silva aff39d20a9 fix(cb-component-comm): check for isFirstChange (#3073)
* fix(cb-component-comm): check for isFirstChange

* update initial message
2017-01-05 12:08:33 +00:00
Ward Bell ce174a26fb docs(router): chalin router copyedits #3054 (#3060)
* docs(router): chalin copyedits
* docs(router): bell copy edits + routing module order & inspect config
2017-01-01 00:25:52 -08:00
Paul Gschwendtner 28d742ffce fix(about): dialog should not show twitter if empty
* The bio directive accidentally shows the Twitter link in the dialog, even if it's undefined.

* Fix deprecation warning of Angular Material, where `md-dialog-actions` should be used instead of the class.
2016-12-22 20:07:32 -08:00
Naomi Black a1ebe1afa1 chore(banner): Add news about material beta to the banner 2016-12-22 20:06:03 -08:00
Naomi Black 47c348e605 chore(about): Update bios and move devrel to top of Google list 2016-12-22 20:05:12 -08:00
Ward Bell bc91b35bd9 docs(router): heavy copy edits (#3021) 2016-12-21 12:08:39 -08:00
Paul Gschwendtner 73c844be70 chore(bios): add bio for Paul Gschwendtner 2016-12-19 22:20:00 -08:00
Patrice Chalin 4a0c3d79b7 docs(api/cheatsheet): show ng version + lang in page header (#2918) 2016-12-01 19:47:58 +00:00
Yang Lin f134cdc2a4 Code 使用与英文相同的等宽字体,与code-example保持一致 2016-11-30 19:26:19 +08:00
Ward Bell 79dc1f2dc8 chore: use common instructions for popping out plunker window-button (#2886)
To see the browser title or address bar changes.
Instructions are a little more complicated when the plunker is in embedded style
2016-11-28 21:23:28 -08:00
Ward Bell cff978aee6 chore(plunker): open in embedded-style by default (#2884)
Added "flat-style" attribute option if you prefer to force a plunker into the original, flat editor style
2016-11-28 21:23:01 -08:00
Ward Bell e0e2e40217 chore: add default title and embedded-style options to <live-example> (#2882)
Adds default title (tooltip) of the example text unless overiden with "title" attribute
The "embedded-style" attribute causes link to open in new tab in the embedded style.
Use for samples that have a confusingly large number of files.
The "embedded" attribute option remains and displays _inline_ in the _same_ tab.
2016-11-27 13:48:20 -08: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
Rex 70606848cc Merge pull request #140 from todoubaba/dependency-injection
Polish dependency-injection.jade
2016-11-26 17:14:55 +00:00
Yang Lin 1aeb6b9c82 Polish dependency-injection.jade 2016-11-27 00:30:27 +08:00
Rex YE d9c651fa47 fix api display 2016-11-26 14:53:33 +00:00
Rex YE dfe65b3ddb fix api main footer 2016-11-26 14:26:29 +00:00
Rex YE 7ade0e9595 fix api display 2016-11-26 14:18:37 +00:00
Yang Lin 2b3c8e5a64 Polish forms.jade 2016-11-26 03:16:06 +08:00
Zhicheng Wang 0c750febfb 解决小抄页无法显示的问题 2016-11-25 22:35:40 +08:00
Yang Lin 2fe21c9f42 Fixes more 2016-11-25 02:38:54 +08:00
Yang Lin ebad4e1d1b Fixes translate.js 2016-11-25 01:15:27 +08:00
Rex YE cf32bc26c8 fix a few translate.js bugs. 2016-11-24 14:16:23 +00:00
Yang Lin 0e444d5d09 Refactoring translate.js 2016-11-24 11:51:21 +08:00
Yang Lin 5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08:00
Ward Bell ec2e6cb2c7 [WIP] docs(quickstart): QuickStart reboot (#2762) 2016-11-21 17:36:16 -08:00