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

..

_boilerplate

chore: make the moduleid loader working on safari (#3532)

2017-04-12 12:03:52 -07:00

animations

docs: followup amends for 4.0 release (#3431)

2017-03-24 17:58:36 +00:00

architecture

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

attribute-directives

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

cb-ajs-quick-reference

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

cb-aot-compiler

build: update rollup (#3478)

2017-03-31 16:39:12 +01:00

cb-component-communication

Merge remote-tracking branch 'origin/master'

2017-04-15 15:34:47 +08:00

cb-dependency-injection

docs(di-cookbook): InjectionToken->OpaqueToken; clarify class-interface

2017-04-01 02:11:47 -07:00

cb-dynamic-component-loader

docs(dyn-comp-loader): add explanations for methods, add doc structure, plunker (#3451)

2017-04-01 11:31:05 -07:00

cb-dynamic-form

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

cb-form-validation

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

cb-i18n

chore: replace refs to "logos/angular2/" with angular (#3477)

2017-03-31 11:59:16 +02:00

cb-set-document-title

refactor: add src folder (#3171)

2017-02-02 19:38:17 +01:00

cb-ts-to-js

docs: update to Angular 4.0 (#3415)

2017-03-23 19:50:10 -07:00

cb-visual-studio-2015/ts

chore: update to @types (#1872)

2016-10-20 17:01:16 -07:00

cli-quickstart

chore: better package.json for zipper (#3344)

2017-03-24 00:12:19 +01:00

component-styles

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

dependency-injection

docs(di-cookbook): InjectionToken->OpaqueToken; clarify class-interface

2017-04-01 02:11:47 -07:00

deployment/ts

docs: update to Angular 4.0 (#3415)

2017-03-23 19:50:10 -07:00

displaying-data

refactor: add src folder (#3171)

2017-02-02 19:38:17 +01:00

forms

docs(forms): move template reference var higher in doc (#3521)

2017-04-11 19:21:47 -07:00

hierarchical-dependency-injection

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

homepage-hello-world

docs: update to Angular 4.0 (#3415)

2017-03-23 19:50:10 -07:00

homepage-tabs

docs: update to Angular 4.0 (#3415)

2017-03-23 19:50:10 -07:00

homepage-todo

docs: update to Angular 4.0 (#3415)

2017-03-23 19:50:10 -07:00

lifecycle-hooks

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

ngcontainer/ts

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

ngmodule

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

pipes

chore: enable old ignored tests (#3531)

2017-04-12 15:31:20 +02:00

quickstart

docs: update to Angular 4.0 (#3415)

2017-03-23 19:50:10 -07:00

reactive-forms

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

router

docs: followup amends for 4.0 release (#3431)

2017-03-24 17:58:36 +00:00

security

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

server-communication

docs: update to Angular 4.0 (#3415)

2017-03-23 19:50:10 -07:00

setup

chore: add systemjs.config.js back to plunkers (#3219)

2017-02-13 15:32:38 -08:00

structural-directives

docs(structural-directives): <template> was replaced by <ng-template> (#3445)

2017-04-11 19:59:12 -07:00

style-guide

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

styleguide

docs: update to Angular 4.0 (#3415)

2017-03-23 19:50:10 -07:00

template-syntax

docs(structural-directives): <template> was replaced by <ng-template> (#3445)

2017-04-11 19:59:12 -07:00

testing/ts

docs(testing): port to Angular v4 (#3524)

2017-04-11 19:42:05 -07:00

toh-1

[WIP] docs(toh): copyedits to conform to Google doc standards (#3032) (#3077)

2017-03-21 11:08:09 -07:00

toh-2

docs(toh-2): move app.component.1.html (#3488)

2017-04-01 11:06:30 -07:00

toh-3

fix(tutorial/3): fix invalid doc region marker (#3437)

2017-03-27 17:07:09 +02:00

toh-4

[WIP] docs(toh): copyedits to conform to Google doc standards (#3032) (#3077)

2017-03-21 11:08:09 -07:00

toh-5

docs(toh): copy edit and fixes in 4, 5, 6 and example (#3412)

2017-03-23 15:47:55 -07:00

toh-6

build: update rollup (#3478)

2017-03-31 16:39:12 +01:00

universal/ts

docs(universal): add guide (#3378)

2017-03-31 17:20:59 +01:00

upgrade-module

docs(upgrade): update NgUpgrade with AoT, router, unit tests (#2803)

2017-02-13 16:45:37 +00:00

upgrade-phonecat-1-typescript

docs(upgrade): update NgUpgrade with AoT, router, unit tests (#2803)

2017-02-13 16:45:37 +00:00

upgrade-phonecat-2-hybrid

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

upgrade-phonecat-3-router

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

upgrade-phonecat-4-final

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

user-input

chore: enable old ignored tests (#3531)

2017-04-12 15:31:20 +02:00

webpack

docs(webpack): update for v4 (#3530)

2017-04-12 14:57:01 +02:00

.gitignore

chore: remove moduleId from examples (#3362)

2017-03-14 12:30:37 +01:00

jsconfig.json

docs(tutorial): combines all 4 sections + revisions/updates to a.53, hides 3&4

2015-12-14 19:57:55 -08:00

package.json

build: update rollup (#3478)

2017-03-31 16:39:12 +01:00

protractor-helpers.ts

Upgrade to 2.2.0

2016-11-22 20:07:16 +08:00

protractor.config.js

Merge remote-tracking branch 'remotes/angular.io/master'

2016-10-17 22:48:18 +01:00

tsconfig.json

fix: misc typos in three files (#3463)

2017-04-01 11:38:49 -07:00