angular-cn

History

Zhicheng Wang 5f1f27e09c Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.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/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/news.jade
#	public/resources/index.jade

2016-05-19 13:33:02 +08:00

controllers

Merge remote-tracking branch 'origin/master'

2016-05-19 13:33:02 +08:00

directives

feat(badging): Enum only matches enums, as opposed to Const and Enums. Const matches const, var, and let

2016-05-16 22:41:43 -04:00

vendor

完成了导航菜单

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

.gitignore

chore(gitignore): ignore the generated web app json files