467 Commits

Author SHA1 Message Date
Zhicheng Wang
94aa3664ab Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.gitignore
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	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/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-12 07:57:51 +08:00
Ward Bell
aef8aa94aa docs(ngmodule): add chapter 2016-08-09 12:31:52 -07:00
Zhicheng Wang
d034bc33c8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/contribute.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-06 19:52:08 +08:00
Brandon Roberts
b93fb12fea chore(examples): Updated live example links to use helper directive
closes #2005
2016-08-05 16:41:45 -07:00
Zhimin YE (Rex)
60a06e51b9 Merge remote-tracking branch 'angular.io/master'
# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-01 09:52:29 +01:00
crisbeto
1e02c4c37c chore(bios): add bio for Kristiyan Kostadinov 2016-07-29 14:48:26 -07:00
Thomas Burleson
486d6c4986 update(bio): improve picture and bio description 2016-07-29 14:48:26 -07:00
Zhicheng Wang
e56ea94549 Merge remote-tracking branch 'origin/master' 2016-07-29 08:05:26 +08:00
Eric Jimenez
1e194b1960 change arrow style function to regular function 2016-07-28 13:43:53 -07:00
Zhicheng Wang
7916ec4c8d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-07-26 17:45:25 +08:00
Fatima Remtullah
af225701b0 chore: update Loved by Millions image
closes #1951
2016-07-25 10:13:23 -07:00
Zhicheng Wang
4400deeef8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gulpfile.js
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/resources/js/controllers/resources-controller.js
2016-07-24 17:27:48 +08:00
Zhicheng Wang
c3b68a6c1b 采纳了几个来自社区的意见 2016-07-22 20:51:32 +08:00
Eric Jimenez
8c1bbbf318 chore: alphabetize entries in resources page. Add margin under frontpage banner 2016-07-19 09:52:25 -07:00
Torgeir Helgevold
f50dff818a docs(toh-pt6): add observables to HTTP tutorial chapter
closes #1528
2016-07-18 23:12:44 -07:00
Zhicheng Wang
e140256358 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
2016-07-17 20:40:12 +08:00
vikerman
6bf6741bcb chore(bios): Added bio for Vikram Subramanian (#1891) 2016-07-15 15:34:05 -07:00
Patrice Chalin
1bef20abc4 docs(api/dart): add support for generation and display (#1888)
Fixes #1880.
Supersedes #1593.
2016-07-15 14:10:12 -07:00
Zhicheng Wang
273a0fd1e8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/webpack.jade
2016-07-11 08:32:56 +08:00
Zhicheng Wang
6975026f0c 微调,改界面文字 2016-07-07 08:33:14 +08:00
Zhicheng Wang
6264d3bcde 批量把Provider/provide改译为提供商/提供,以和ISP(互联网服务提供商)的译法看齐 2016-07-07 08:22:36 +08:00
Zhicheng Wang
0303a18020 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-07-07 08:15:51 +08:00
Brandon Roberts
791b364f6a chore(bios): Added bio for Brandon Roberts 2016-07-06 13:02:27 -07:00
Patrice Chalin
b0e0d94b5c docs: revert Jade to markdown
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
2016-07-05 23:03:30 -07:00
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