angular-cn/public/_includes
Zhicheng Wang 969da7d321 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/homepage-hello-world/ts/index.1.html
#	public/docs/_examples/homepage-tabs/ts/index.1.html
#	public/docs/_examples/homepage-todo/ts/index.1.html
#	public/docs/_examples/systemjs.config.plunker.build.js
#	public/docs/_examples/systemjs.config.plunker.js
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.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/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/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/typescript-configuration.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/toh-pt6.jade
#	public/features.jade
#	public/resources/js/directives/live-example.js
#	tools/plunker-builder/indexHtmlTranslator.js
2016-09-08 17:20:01 +08:00
..
_banner.jade 直接加空格方式效果不理想,改用js和css配合来加空格 2016-06-19 16:46:50 +08:00
_cta-bar.jade 完成了各种公共页面的汉化 2016-04-13 08:53:17 +08:00
_footer.jade 修改备案号格式 2016-08-28 06:37:16 +08:00
_head-include.jade 完成了各种公共页面的汉化 2016-04-13 08:53:17 +08:00
_hero-home.jade fix: banner for angularconnect 2016-08-24 17:00:20 +01:00
_hero.jade Merge remote-tracking branch 'origin/master' 2016-09-08 17:20:01 +08:00
_hover-card.jade bugfix: 去掉了多加的translate-cn 2016-06-19 17:11:40 +08:00
_logo-shield.jade sub header, cta bar, logos, announcement 2015-02-26 21:30:06 -08:00
_main-nav.jade chore: hide the english toggle link until angular is loaded 2016-07-15 17:58:01 +02:00
_next-item.jade Merge remote-tracking branch 'origin/master' 2016-08-06 19:52:08 +08:00
_scripts-include.jade chore: add embedded plunkers functionality (#2194) 2016-08-25 10:44:22 -07:00
_util-fns.jade Merge remote-tracking branch 'origin/master' 2016-09-08 17:20:01 +08:00
_version-dropdown.jade Merge remote-tracking branch 'origin/master' 2016-09-08 17:20:01 +08:00