Commit Graph

443 Commits

Author SHA1 Message Date
Zhicheng Wang 0dd2932a2e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/news.jade
#	public/resources/_data.json
#	public/resources/index.ejs
#	public/resources/js/controllers/resources-controller.js
2016-07-01 08:38:54 +08:00
Zhicheng Wang 21fe9dc1d2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade
2016-07-01 08:24:23 +08:00
Zhicheng Wang 6c0cc46a01 chore: add Ralph to bios 2016-06-30 13:19:28 -07:00
Eric Jimenez 868abbe5c7 new style with new schema 2016-06-30 12:36:14 -04:00
Eric Jimenez 4a5f074061 add placeholder text when no description is found 2016-06-30 12:28:39 -04:00
Zhimin YE (Rex) 9b40ea56dc chore: add Rex bios 2016-06-29 12:28:07 -07:00
Zhicheng Wang fb22c0556c 内容微调 2016-06-29 13:11:23 +08:00
Mike Ryan f1f03cf28c chore(bios): Add Mike Ryan 2016-06-28 22:02:12 -07:00
Naomi Black 7fa73c4cb0 chore(june28): updates to news, events, team bio for max 2016-06-28 18:56:29 -07:00
Zhicheng Wang bb9adc3eba Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade
2016-06-23 08:48:57 +08:00
Naomi Black 8ad5595a7c docs(security): make screenshot english and update tagline 2016-06-21 11:53:49 -07:00
Martin Probst fb179d9690 docs(security): Add security documentation.
Substantially rewritten, based on original content by Brian Clarkio and
Ward Bell and contributions from Naomi Black.
2016-06-21 10:51:25 -07:00
Eric Jimenez 9107eeeee8 feat: add bio for eric. 2016-06-21 09:30:29 -07:00
Fatima Remtullah 8516690e91 feat: add fatima bio to about page 2016-06-21 09:29:05 -07:00
Naomi Black 4a3f7afb66 chore(bios): update core team list 2016-06-20 22:45:41 -07:00
Torgeir Helgevold 218cc82f1c chore(bios) Add tor 2016-06-20 22:38:32 -07:00
Rob Wormald b11e8827bc chore(bios): add rob w 2016-06-20 21:51:21 -07:00
Eric Jimenez 42e8c4a10c feat(filter stable): filter by stability stable 2016-06-20 14:26:34 -04:00
Zhicheng Wang 7202fa6cb4 bugfix: 自动加空格时没有忽略html标签,导致界面混乱 2016-06-19 19:31:02 +08:00
Zhicheng Wang 80a044fa7c 直接加空格方式效果不理想,改用js和css配合来加空格 2016-06-19 16:46:50 +08:00
Zhicheng Wang 0aa207bbac Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/_data.json
2016-06-19 10:17:03 +08:00
Zhicheng Wang e3b33ab31c VS2015集成完毕;第三方资源汉化完毕 2016-06-18 14:35:32 +08:00
Naomi Black da3d8f7f73 style(images): add image best practices to styleguide doc 2016-06-16 16:06:13 -07:00
Foxandxss 3b4b79aeeb docs(animations): use our heroes 2016-06-16 18:55:17 +02:00
Zhicheng Wang eb35497932 embed resources data 2016-06-16 23:24:23 +08:00
Zhimin YE (Rex) e8a462435c Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/news.jade
2016-06-16 09:03:59 +01:00
Tero Parviainen bead3620df docs(animate): add animations documentation 2016-06-15 15:14:45 -07:00
Zhicheng Wang 80c36ac7f5 Merge remote-tracking branch 'origin/master' 2016-06-08 17:01:20 +08:00
Zhicheng Wang 3d01acbf7b 微调翻译
允许翻译中出现省略号
2016-06-08 16:58:36 +08:00
Foxandxss fb49cbe33f docs(cli-quickstart): add cli 5 min quickstart
closes #1606
2016-06-07 18:51:27 -07:00
Zhimin YE (Rex) 72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-01 09:51:27 +01:00
Ward Bell ae2d8f2730 docs(template-syntax): add brief example of HTML sanitization in binding.
Also clarified interpolation v. property binding example for PR #1564
2016-05-31 18:36:22 -07:00
Zhicheng Wang 25f5698e71 对所有外站链接,直接开新窗口打开,修改小bug 2016-05-31 18:02:57 +08:00
Zhicheng Wang 1dc3b54fe0 当点击链接或按钮时,不再切换原文显示 2016-05-31 12:52:39 +08:00
Zhicheng Wang 20bf6c0085 翻译完了“升级”一章的新增部分
合并了测试索引
解决了移动设备上菜单显示不全的问题
文字微调
2016-05-31 12:35:37 +08:00
Zhicheng Wang 3c666d881e 修改了输入法笔误
解决了移动设备上菜单显示不全的问题
2016-05-31 07:30:15 +08:00
Zhimin YE (Rex) 7ea5c39a47 removed () from english words in display-data.jade.
user-input.jade: review is completed.
_translate.scss: added selector for code within text - to change their font-family for chinese font.
2016-05-27 14:48:06 +01:00
Zhicheng Wang 94243b9b52 更新了字体,适应更多设备 2016-05-27 17:43:49 +08:00
Zhimin YE (Rex) 7c6bf77fa0 Merge branch 'master' of https://github.com/angular/angular-cn 2016-05-27 10:42:03 +01:00
Zhimin YE (Rex) 4f3050aeed more review for displaying-data and appended english font-family. 2016-05-27 10:41:49 +01:00
Zhicheng Wang 88a86ff4a0 开发指南-管道 初译即将完成 2016-05-27 17:40:58 +08:00
Zhimin YE (Rex) c1efe5e46f change font-family globally to default: Microsoft YaHei. 2016-05-27 10:16:59 +01:00
Zhimin(Rex) YE cbea511cad Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/guide/template-syntax.jade
2016-05-26 23:48:22 +01:00
Eric Jimenez a0a0e8f35c docs: align badges vertically within their container, remove shadow from content area 2016-05-26 09:22:25 -07:00
Zhicheng Wang cb756a5a05 统一了大量Attribute和Property的翻译
更新了小抄
调整了翻译样式
2016-05-24 11:33:50 +08:00
Zhicheng Wang 29df35d724 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-05-20 15:34:27 +08:00
Zhicheng Wang 3c2269c8b5 补充两个cdn库 2016-05-20 13:00:09 +08:00
Ward Bell 3324bd944d docs(toh-6): fix broken 'Add Hero' and fill in instructional gaps 2016-05-19 19:00:20 -07:00
Zhicheng Wang 15110fa926 QuickStart冲突太多,重新翻译了一遍 2016-05-19 16:32:43 +08:00
Torgeir Helgevold e4db340464 docs:(TOH chapter on Http) New Tour of Hero Chapter on Http 2016-05-18 23:38:08 -07:00