Yang Lin
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +08:00
Zhimin YE
4578087fa5
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# README.md
# harp.json
# public/_includes/_hero-home.jade
# public/docs/_examples/quickstart/ts/systemjs.config.1.js
# public/docs/dart/latest/_util-fns.jade
# public/docs/dart/latest/api/_data.json
# public/docs/dart/latest/api/index.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/cookbook/visual-studio-2015.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/animations.jade
# public/docs/ts/latest/guide/change-log.jade
# public/docs/ts/latest/guide/npm-packages.jade
# public/docs/ts/latest/guide/router.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/testing.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt3.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
Server Communication and Visual studio 2015 require further merging.
2016-11-03 15:38:23 +00:00
Patrice Chalin
89f1af9807
chore(harp.json): remove unused parameters ( #2681 )
2016-10-28 00:17:40 +01:00
rexebin
ce3930b2c0
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# harp.json
# public/_includes/_hero-home.jade
# public/_includes/_scripts-include.jade
# public/docs/_examples/quickstart/js/package.1.json
# public/docs/_includes/_side-nav.jade
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/api/_data.json
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/ngmodule-faq.jade
# public/docs/ts/latest/cookbook/rc4-to-rc5.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/browser-support.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/ngmodule.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/_data.json
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
2016-10-17 22:48:18 +01:00
Patrice Chalin
db6625eb30
Fix dartdoc styles and prep layout for ng2 pages ( #2530 )
...
- Use custom bootstrap grid system styles
- Cache a copy of the dartdoc static-assets styles.css w/ footer styles
disabled.
- Alternate page layout controlled by jade2ng harp global
2016-10-03 14:58:50 -07:00
rexebin
6a3f9614d0
remove 一个
2016-09-25 19:58:46 +01:00
rexebin
d9af771f8d
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# README.md
# public/contribute.jade
# public/docs/_includes/_side-nav.jade
# public/docs/_includes/_ts-temp.jade
# public/docs/index.jade
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/component-relative-paths.jade
# public/docs/ts/latest/cookbook/index.jade
# public/docs/ts/latest/cookbook/set-document-title.jade
# public/docs/ts/latest/cookbook/visual-studio-2015.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/animations.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/browser-support.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/index.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/index.jade
# public/support.jade
2016-09-23 22:13:02 +01:00
Jesús Rodríguez
693f6ae462
chore: rename Angular 2 to simply Angular ( #2402 )
2016-09-19 20:24:40 -07:00
Naomi Black
1027e3e9be
about(shannon): add shannon's bio
2016-09-19 17:41:23 -07:00
Zhicheng Wang
2417245114
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/_data.json
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_hero.jade
# public/_includes/_main-nav.jade
# public/_includes/_util-fns.jade
# public/docs/_includes/_side-nav.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/animations.jade
# public/docs/ts/latest/guide/ngmodule.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/testing/_data.json
# public/docs/ts/latest/testing/application-under-test.jade
# public/docs/ts/latest/testing/first-app-tests.jade
# public/docs/ts/latest/testing/index.jade
# public/docs/ts/latest/testing/jasmine-testing-101.jade
# public/docs/ts/latest/testing/testing-an-angular-pipe.jade
# public/index.jade
# public/resources/css/main.scss
# public/resources/css/module/_side-nav.scss
2016-09-15 15:23:48 +08:00
Kapunahele Wong
bfc62e0509
chore(bios): adding bio
2016-09-14 18:27:02 -07:00
Georgios Kalpakas
c3aa8945fb
chore(bios): add bio for gkalpak
2016-09-14 14:38:10 -07:00
Georgios Kalpakas
4c5848c670
style(bios): make whitespace consistent
2016-09-14 14:38:10 -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
Naomi Black
68c9561dec
banner(angularconnect): add an ac promo to the banner
2016-07-29 15:23:03 -07: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
9334c93401
做了初步的SEO
2016-07-26 08:28:02 +08:00
vikerman
6bf6741bcb
chore(bios): Added bio for Vikram Subramanian ( #1891 )
2016-07-15 15:34:05 -07:00
Brandon Roberts
791b364f6a
chore(bios): Added bio for Brandon Roberts
2016-07-06 13:02:27 -07:00
Zhicheng Wang
6c0cc46a01
chore: add Ralph to bios
2016-06-30 13:19:28 -07:00
Zhimin YE (Rex)
9b40ea56dc
chore: add Rex bios
2016-06-29 12:28:07 -07: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
Naomi Black
b137468f52
chore(typo): fix a typo in the list of bios
2016-06-21 11:12:27 -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
Dan Caddigan
a979c71089
chore(typo): harp.json typo
...
closes #1552
2016-05-31 22:17:45 -07:00
Stephen Fluin
06872dc4e6
chore(bio): Added missing website for Stephen
...
closes #1253
2016-05-10 17:10:24 -07:00
Stephen Fluin
798a55b6f7
chore(bio): Added bio for Stephen Fluin
2016-04-29 17:25:46 -07:00
Hans Larsen
0c5ad7c3bc
fix: twitter handle.
2016-04-20 13:14:58 -07:00
Foxandxss
2b35ddf1c3
chore(bio): add Jesus' bio
...
closes #992
2016-04-11 21:47:04 -07:00
Jesse Palmer
76abf7bebd
docs(bio): fixes Jules' bio links
...
closes #1027
2016-04-02 14:13:16 -07:00
Deborah Kurata
28c5dbdbf4
chore(bio): add Deborah's bio
...
closes #1024
2016-04-02 14:11:03 -07:00
Naomi Black
ded7bb7c47
chore(bios): update bio for Alex
2016-03-21 11:41:20 -07:00
Naomi Black
87a7dfe035
chore(bios): remove inactive team members
2016-03-16 21:23:52 -07:00
Tero Parviainen
fb5532510c
chore(bio): add Tero's bio
...
closes #959
2016-03-14 12:49:11 -07:00
Filipe Silva
e42341c9e7
chore(bio): add Filipe's bio
...
closes #949
2016-03-11 11:33:33 -08:00
Marcy Sutton
5a93328bf6
chore(bio): update for Marcy Sutton
2016-03-09 15:54:18 -08:00
Hans Larsen
891faa79c8
chore(bio): Adding Hans' bio.
2016-03-07 15:50:15 -08:00
Chuck Jazdzewski
f07ca644a6
chore(bios): Added ChuckJ's bio
2016-02-19 00:33:17 -08:00
Naomi Black
7e198e5383
chore(bio): Update Naomi's bio for 2016
2016-02-01 14:58:39 -08:00
Kara Erickson
ff5f21fc74
chore(bios): add kara's bio and pic
2016-01-14 00:12:32 -08:00
Topher Fangio
e66aaa696e
docs(harp): add bio for Topher Fangio
...
Closes #363
2015-11-13 16:46:57 +00:00
Martin Staffa
18b2be8575
add Martin Staffa to contributors
2015-10-19 15:44:37 +01:00
Jeff Whelpley
6490663a2c
Adding Jeff Whelpley as a contributor
2015-10-18 23:30:04 +01:00
John Papa
6fb3c8dd5b
bio
2015-10-18 22:19:44 +01:00