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

..

api

refact(docs-app): move filtered API list into a directive

2015-12-10 21:35:02 -08:00

cookbook

Merge remote-tracking branch 'origin/master'

2016-09-08 17:20:01 +08:00

guide

docs: delete forms- and router-deprecated, jade + examples (#2328)

2016-09-13 18:49:51 -07:00

testing

chore: new flat left navigation panel (all language tracks)

2016-03-03 04:51:52 -08:00

tutorial

docs(toh-6): refactoring of 'add, edit, delete heroes' (#2170)

2016-08-26 14:57:45 -07:00

_data.json

chore: here we are (#2353)

2016-09-15 02:41:19 +01:00

_util-fns.jade

improved infrastructure for devguide and revised getting started (TS)

2015-09-10 13:32:57 -07:00

cheatsheet.jade

chore(cheatsheet): fix double banner issue (#2293)

2016-09-08 15:01:39 -07:00

glossary.jade

docs(glossary): general cleanup and fix links (#2100)

2016-08-17 17:50:42 -07:00

help.jade

fixed duplication for help

2015-03-04 19:33:12 -08:00

index.jade

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

quickstart.jade

docs(quickstart/js): app JS files order is not significant

2016-08-24 23:38:03 -07:00

resources.jade

docs: simplify left nav selection/scroll

2016-03-04 23:54:44 -08:00

styleguide.jade

docs: temporary TS-referencing chapters for gaps in JS/Dart

2016-03-01 11:22:04 -08:00