Skip to content

Commit

Permalink
Merge different changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jerdog committed Jun 6, 2024
2 parents a8b4fa4 + 85c934b commit 73a7689
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 25 deletions.
2 changes: 1 addition & 1 deletion data/events/2022/amsterdam/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ sponsors:
- id: pvh
level: gold
# tshirt
- id: okta
- id: okta-before-20240603
level: tshirt
# lanyard
- id: ogd
Expand Down
2 changes: 2 additions & 0 deletions data/events/2024/amsterdam/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ sponsors:
level: silver
- id: komodor
level: silver
- id: picnic
level: silver
# Bronze
- id: devleaps
level: bronze
Expand Down
4 changes: 2 additions & 2 deletions data/events/2024/houston/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ga_tracking_id: "" # If you have your own Google Analytics tracking ID, enter it
# Note: we allow 2024-MM-DD for backward compatibility, but it can lead to unexpected behaviors (like your event disappearing from the front page during your last day)

startdate: 2024-06-04T00:00:00-06:00 # The start date of your event. Leave blank if you don't have a venue reserved yet.
enddate: 2024-06-05T00:00:00-06:00 # The end date of your event. Leave blank if you don't have a venue reserved yet.
enddate: 2024-06-05T23:00:00-06:00 # The end date of your event. Leave blank if you don't have a venue reserved yet.

# Leave CFP dates blank if you don't know yet, or set all three at once.
cfp_date_start: 2024-02-01T00:00:00-06:00 # start accepting talk proposals.
Expand Down Expand Up @@ -341,4 +341,4 @@ ignites:
- title: "budhaditya-bhattacharya-ignite"
date: "2024-06-05T00:00:00-06:00"
- title: "timothy-banks-ignite"
date: "2024-06-05T00:00:00-06:00"
date: "2024-06-05T00:00:00-06:00"
4 changes: 2 additions & 2 deletions data/events/2024/london/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ location: "London" # Defaults to city, but you can make it the venue name.
location_address: "QEII Centre, Broad Sanctuary, Westminster"

nav_elements: # List of pages you want to show up in the navigation of your page.
# - name: registration
- name: propose
- name: registration
# - name: propose
# - name: program
# - name: speakers
- name: location
Expand Down
9 changes: 8 additions & 1 deletion data/events/2024/rio-de-janeiro/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,10 @@ organizer_email: "contato@devopsdays.rio.br" # Put your organizer email address
# Check data/sponsors/ to use sponsors already added by others.
sponsors:
#Gold

- id: stone
level: gold
url: https://www.stone.com.br/

#Silver
- id: elastic
level: silver
Expand All @@ -136,6 +139,10 @@ sponsors:
level: bronze
url: https://aws.amazon.com

- id: globotv
level: silver
url: https://globo.com

#Community
- id: punkdodevops
level: community
Expand Down
19 changes: 0 additions & 19 deletions data/events/2025/kansas-city/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,32 +75,13 @@ team_members: # Name is the only required field for team members.
github: "jerdog"
image: "jeremy-meiss.jpg"
bio: "Jeremy is an experienced Developer Experience and Community leader with almost 30 years in Tech. He's is active in the DevRel and DevOps communities, and is a co-creator of DevOpsPartyGames.com. A lover of all things coffee, community, open source, and tech, he is a husband and father, and is also house-broken, and (generally) plays well with others."
- name: "Kayla Harmon"
employer: "Unaffiliated"
linkedin: "https://www.linkedin.com/in/kaylacrowder/"
image: "kayla-harmon.jpg"
bio: "Kayla Harmon is an IT veteran with over 20 years of experience wrangling servers and herding cats in the KC Metro. She is a polymath intent on absorbing information on myriad subjects. She is just as likely to have deep knowledge of all things IT as she is all things esoteric. She spends her free time building and playing on Minecraft servers, gardening, studying yoga and Ayurveda, and hanging out with various animals."
- name: "Jeff Stephens"
employer: "C2FO"
twitter: "tbplayer7"
linkedin: "https://www.linkedin.com/in/jeff-stephens-6bb0928b/"
github: "tbplayer7"
image: "jeff-stephens.jpg"
bio: "Jeff has worked as a Linux Systems Administrator for the last 13 years. His current focus is cloud application platforms. Beyond work, he is an avid baseball fan, and spends his free time as a musician and photographer."
- name: "Ben Dechrai"
employer: "Sonar"
twitter: "https://ben.sc/twitter"
linkedin: "https://ben.sc/linkedin"
github: "https://ben.sc/github"
image: "ben-dechrai.png"
bio: "Ben Dechrai is a technologist with a strong focus on security and privacy. At 11 years old he wrote software to stop his parents from breaking the family PC, and now he works as a developer advocate at Sonar, helping developers avoid breaking the internet through better security and coding practices. He enjoys helping others find the joy of problem-solving and experimentation."
- name: "Heather Downing"
employer: "Quorralyne Development"
twitter: "quorralyne"
linkedin: "http://linkedin.com/in/heathermdowning"
website: "https://quorralyne.com/"
image: "heather-downing.jpg"
bio: "Software dev & speaker. Developer Advocate & Microsoft MVP. #dotNET/APIs/identity/drones. Technical, curious and traveling often from KC, Missouri. @kc_dc crew"
- name: "Eric Lee"
employer: "AWS"
twitter: "ericblee6"
Expand Down
2 changes: 2 additions & 0 deletions data/sponsors/okta-before-20240603.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "Okta"
url: "https://okta.com/"
2 changes: 2 additions & 0 deletions data/sponsors/picnic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name: "Picnic"
url: "https://jobs.picnic.app/en/home"
Binary file added static/img/sponsors/okta-before-20240603.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/img/sponsors/okta.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/sponsors/picnic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 73a7689

Please sign in to comment.