Zhicheng Wang 583247f0f9 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	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/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/features.jade
#	public/index.jade

2016-05-03 22:33:20 +08:00

..

_includes

Merge remote-tracking branch 'origin/master'

2016-05-03 22:33:20 +08:00

about

完成了各种公共页面的汉化

2016-04-13 08:53:17 +08:00

cardboard

完成了各种公共页面的汉化

2016-04-13 08:53:17 +08:00

docs

Merge remote-tracking branch 'origin/master'

2016-05-03 22:33:20 +08:00

resources

Merge remote-tracking branch 'origin/master'

2016-05-03 22:33:20 +08:00

_data.json

Merge remote-tracking branch 'origin/master'

2016-05-03 22:33:20 +08:00

_layout.jade

adds ng-cloak across site

2015-12-15 01:02:41 -08:00

404.jade

完成了各种公共页面的汉化

2016-04-13 08:53:17 +08:00

all-resources.jade

feat(resources): add more pages. Increase font size. Rename in footer. All encompassing resource page

2016-04-29 20:07:13 -04:00

books.jade

feat(resources): add more pages. Increase font size. Rename in footer. All encompassing resource page

2016-04-29 20:07:13 -04:00

communities.jade

feat(resources): add more pages. Increase font size. Rename in footer. All encompassing resource page

2016-04-29 20:07:13 -04:00

contribute.jade

完成了各种公共页面的汉化

2016-04-13 08:53:17 +08:00

events.jade

events(i/o): add google i/o to events page

2016-04-26 23:32:39 -07:00

favicon.ico

Add favicon.ico to the top level of the site

2015-03-03 04:32:05 -08:00

features.jade

Merge remote-tracking branch 'origin/master'

2016-05-03 22:33:20 +08:00

google5a670c2e11d1d2f6.html

chore(verification): verify domain ownership for google

2016-01-26 15:15:21 -08:00

googleb96cceae5888d79f.html

chore(webmaster): update webmaster tools key

2015-12-15 10:21:17 -08:00

index.jade

Merge remote-tracking branch 'origin/master'

2016-05-03 22:33:20 +08:00

license

chore: add gulp link-checker task

2016-03-10 23:53:43 -08:00

license.txt

chore(routing): host the license file on angular.io

2016-01-08 15:14:20 -08:00

news.jade

Merge branch 'master' of github.com:angular/angular.io

2016-04-20 20:09:50 +08:00

presskit.jade

chore(presskit): make reuse permissions more clear

2016-04-29 23:05:31 -07:00

support.jade

完成了各种公共页面的汉化

2016-04-13 08:53:17 +08:00

survey.html

完成了各种公共页面的汉化

2016-04-13 08:53:17 +08:00

tooling.jade

feat(resources): add more pages. Increase font size. Rename in footer. All encompassing resource page

2016-04-29 20:07:13 -04:00

training.jade

feat(resources): add more pages. Increase font size. Rename in footer. All encompassing resource page

2016-04-29 20:07:13 -04:00