Skip to content

Commit

Permalink
Merge pull request #2142 from 18F/dev
Browse files Browse the repository at this point in the history
Dev --> Master
  • Loading branch information
gemfarmer authored Dec 21, 2016
2 parents fa056f3 + c2ea438 commit 3fbafb4
Show file tree
Hide file tree
Showing 275 changed files with 1,000 additions and 344 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ruby "2.3.1"
gem "redcarpet"
gem "jekyll", '~> 3.1'
gem "html-proofer"
gem "accesslint-ci", "0.2.6"

group :jekyll_plugins do
if ENV['FAST_BUILDS'] == 'true'
Expand Down
20 changes: 20 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ GIT
GEM
remote: https://rubygems.org/
specs:
accesslint-ci (0.2.6)
rest-client (~> 2.0)
thor (~> 0.19)
activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
Expand All @@ -18,6 +21,8 @@ GEM
coderay (1.1.1)
colorator (1.1.0)
colored (1.2)
domain_name (0.5.20161129)
unf (>= 0.0.5, < 1.0.0)
ethon (0.9.1)
ffi (>= 1.3.0)
ffi (1.9.14)
Expand All @@ -36,6 +41,8 @@ GEM
typhoeus (~> 0.7)
yell (~> 2.0)
htmlentities (4.3.4)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.7.0)
jekyll (3.3.0)
addressable (~> 2.4)
Expand Down Expand Up @@ -82,8 +89,12 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
mercenary (0.3.6)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
netrc (0.11.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
parallel (1.9.0)
Expand All @@ -98,21 +109,30 @@ GEM
ffi (>= 0.5.0)
rb-readline (0.5.3)
redcarpet (3.3.4)
rest-client (2.0.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.22)
slop (3.6.0)
thor (0.19.4)
thread_safe (0.3.5)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
yell (2.0.6)

PLATFORMS
ruby

DEPENDENCIES
accesslint-ci (= 0.2.6)
html-proofer
jekyll (~> 3.1)
jekyll-archives!
Expand Down
10 changes: 6 additions & 4 deletions _authors/18F.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
---
name: 18F
first_name: 18F
last_name:
last_name:
full_name: 18F
role: Organization
city:
state:
city:
state:
github: 18F
twitter: 18F
team: 18F
redirect_from: /team/18F/
redirect_from: "/team/18F/"
published: true
---

8 changes: 5 additions & 3 deletions _authors/aaron.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ full_name: Aaron Snow
role: Executive Director
city: Washington
state: D.C.
github:
twitter:
github:
twitter:
team: 18F
redirect_from: /team/aaron/
redirect_from: "/team/aaron/"
alumni: true
published: true
---

4 changes: 3 additions & 1 deletion _authors/ada-lovelace.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@ joke: |
Due to other commitments, Ada will be working for the team only on April 1st. If you'd like to join Ada (and not just for April 1) you can <a href="https://pages.18f.gov/joining-18f/">see all of our openings and learn more about working at 18F</a>.)
layout: nothing
redirect_from: /team/ada-lovelace/
redirect_from: "/team/ada-lovelace/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/adam-kendall.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role:
state: VA
team: Engineering
twitter:
redirect_from: /team/adam-kendall/
redirect_from: "/team/adam-kendall/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/adrian-webb.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role: Technical Architect
state: D.C.
team: Consulting
twitter:
redirect_from: /team/adrian-webb/
redirect_from: "/team/adrian-webb/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/afeld.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ state: NY
github:
twitter:
team: Delivery
redirect_from: /team/afeld/
redirect_from: "/team/afeld/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/alan-atlas.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role:
state: WA
team:
twitter:
redirect_from: /team/alan-atlas/
redirect_from: "/team/alan-atlas/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/alan-brouilette.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role: Product Manager
state: IL
team: Product
twitter:
redirect_from: /team/alan-brouilette/
redirect_from: "/team/alan-brouilette/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/alan-turing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ joke: |
Due to other commitments, Mr. Turing will be working for the team only on April 1st. If you'd like to join Alan (and not just for April 1) you can <a href="https://pages.18f.gov/joining-18f/">see all of our openings and learn more about working at 18F</a>.)
layout: nothing
redirect_from: /team/alan-turing/
redirect_from: "/team/alan-turing/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/alan.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ state: D.C.
github:
twitter:
team: Consulting
redirect_from: /team/alan/
redirect_from: "/team/alan/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/alex-bisker.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role:
state: New York
team: Delivery
twitter:
redirect_from: /team/alex-bisker/
redirect_from: "/team/alex-bisker/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/alex-pandel.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role:
state: CA
team:
twitter:
redirect_from: /team/alex-pandel/
redirect_from: "/team/alex-pandel/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/alexander-hamilton.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@ joke: |
Due to other commitments, Alexander will be working for the team only on April 1st. If you'd like to join Alex (and not just for April 1) you can <a href="https://pages.18f.gov/joining-18f/">see all of our openings and learn more about working at 18F</a>.)
layout: nothing
redirect_from: /team/alexander-hamilton/
redirect_from: "/team/alexander-hamilton/"
published: false
---

2 changes: 2 additions & 0 deletions _authors/alison.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ twitter:
team:
redirect_from:
alumni: true
published: true
---

4 changes: 3 additions & 1 deletion _authors/alla.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role: Deputy for Acquisition
state: DC
team: Acquisition
twitter:
redirect_from: /team/alla/
redirect_from: "/team/alla/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/amanda-robinson.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role: Developer
state: DC
team: Delivery
twitter: aertzeid
redirect_from: /team/amanda-robinson/
redirect_from: "/team/amanda-robinson/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/amanda-schonfeld.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role:
state: IL
team:
twitter:
redirect_from: /team/amanda-schonfeld/
redirect_from: "/team/amanda-schonfeld/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/amber.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role:
state:
team:
twitter:
redirect_from: /team/amber/
redirect_from: "/team/amber/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/amos.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ state: CA
github:
twitter:
team: Delivery
redirect_from: /team/amos/
redirect_from: "/team/amos/"
published: true
---

2 changes: 2 additions & 0 deletions _authors/amy-wilson.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ state:
team:
twitter:
redirect_from:
published: true
---

4 changes: 3 additions & 1 deletion _authors/andre.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@ project:
- 18F Blog
- 18f.gsa.gov
- 18F Consulting
redirect_from: /team/andre/
redirect_from: "/team/andre/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/andrew.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ state: D.C.
github:
twitter:
team: Presidential Innovation Fellowship
redirect_from: /team/andrew/
redirect_from: "/team/andrew/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/andrewmaier.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ state: D.C.
github:
twitter:
team: Design
redirect_from: /team/andrewmaier/
redirect_from: "/team/andrewmaier/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/andrewmcmahon.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ full_name: Andrew McMahon
city: San Francisco
state: CA
team: GSA
role:
role:
guest: true
published: true
---

4 changes: 3 additions & 1 deletion _authors/angela-colter.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role:
state:
team:
twitter:
redirect_from: /team/angela-colter/
redirect_from: "/team/angela-colter/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/anna.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role: Project Manager
github:
twitter:
team: Delivery
redirect_from: /team/anna/
redirect_from: "/team/anna/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/annalee.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ state: D.C.
github:
twitter:
team: Delivery
redirect_from: /team/annalee/
redirect_from: "/team/annalee/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/anthony-garvan.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role:
state:
team:
twitter:
redirect_from: /team/anthony-garvan/
redirect_from: "/team/anthony-garvan/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/bateman.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ state: DC
github: batemapf
twitter:
team:
redirect_from: /team/bateman/
redirect_from: "/team/bateman/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/becky.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ github:
twitter:
email: rebecca.sweger@gsa.gov
team: Delivery
redirect_from: /team/becky/
redirect_from: "/team/becky/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/ben.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ state: D.C.
github:
twitter:
team: Presidential Innovation Fellows
redirect_from: /team/ben/
redirect_from: "/team/ben/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/betsy-ross.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ joke: |
Due to other commitments, Betsy will be working for the team only on April 1st. If you'd like to join Betsy (and not just for April 1) you can <a href="https://pages.18f.gov/joining-18f/">see all of our openings and learn more about working at 18F</a>.)
layout: nothing
redirect_from: /team/betsy-ross/
redirect_from: "/team/betsy-ross/"
published: false
---

4 changes: 3 additions & 1 deletion _authors/bill.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ role:
state:
team:
twitter:
redirect_from: /team/bill/
redirect_from: "/team/bill/"
published: true
---

4 changes: 3 additions & 1 deletion _authors/blacktm.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ state: D.C.
github:
twitter:
team: Consulting
redirect_from: /team/blacktm/
redirect_from: "/team/blacktm/"
published: true
---

Loading

0 comments on commit 3fbafb4

Please sign in to comment.