From fa42a72ae957e8e62d1f554a8f21af5b8f247777 Mon Sep 17 00:00:00 2001 From: Janine vN Date: Wed, 23 Jun 2021 21:44:08 -0400 Subject: Updating bootcamp information Adds time and more information about the GitHub bootcamp. --- .../templates/events/pages/code-jams/8/_index.html | 2 +- .../events/pages/code-jams/8/github-bootcamp.html | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html index 9ebca7c7..d3d3cc0f 100644 --- a/pydis_site/templates/events/pages/code-jams/8/_index.html +++ b/pydis_site/templates/events/pages/code-jams/8/_index.html @@ -25,7 +25,7 @@
  • Tuesday, June 15 - Form to submit theme suggestions opens
  • Monday, June 21 - The Qualifier is released
  • Friday, June 25 - Voting for the theme opens
    • -
  • Saturday, June 26 - GitHub Bootcamp
    • +
  • Saturday, June 26 @ 12PM UTC- GitHub Bootcamp
  • Wednesday, June 30 - The Qualifier closes
  • Friday, July 9 - Code Jam begins
  • Friday, July 16 - Coding portion of the jam ends
    • diff --git a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html index 18951e48..bac03d11 100644 --- a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html +++ b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html @@ -13,24 +13,29 @@ {% block event_content %}

    - This year we'll be running a GitHub Bootcamp on Saturday, June 26th. + This year we'll be running a GitHub Bootcamp on Saturday, June 26th at 4PM UTC. This bootcamp is intended to be an interactive workshop session where we help participants - get setup with git and using it in a team environment. + get setup with git and using it in a team environment. If you are new to git or would like to brush up on it, + then this is the perfect event for you. +

    +

    + The instructional parts of this bootcamp will be recorded. We'll also be providing a cheatsheet / reference guide to all attendees that will + be made available here for download.

    Session 1: Setting up Git

    - This session will run for an hour and be focused on installing and setting up git for the first time. - We'll have helpers available to help you set up git and get it integreated with your editor of choice. + This first session will run for an hour starting at 4PM UTC. It will be focused on installing and setting up git for the first time. + We'll have helpers available to help you set up git and integreated with your editor of choice. Whether it's PyCharm, VSCode, or vim, we can help you get rolling with version control.

    Session 2: Using git and github in a team environment

    - This session will run for an hour. It will be focused on using git and GitHub in a team environment. - You'll be put in a group of people with a repo to work on. + This session will run for an hour starting at 5PM UTC. It will be focused on using git and GitHub in a team environment. + You'll be put in a group with other attendees and use the common git commands for working in a repo. + You'll learn how to set-up a GitHub reposity with other contributors, how to make branches, make commits, pull down changes, and then make pull requests. + We'll also be going over different strategies for creating branches and best practices for commits and pull requests.

    - - {% endblock %} {% block sidebar %} -- cgit v1.2.3 From 57a6ff40d3abbad39db1394b679c5358bfa9b274 Mon Sep 17 00:00:00 2001 From: Janine vN Date: Wed, 23 Jun 2021 22:01:50 -0400 Subject: Change time to UTC --- pydis_site/templates/events/pages/code-jams/8/_index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/events/pages/code-jams/8/_index.html b/pydis_site/templates/events/pages/code-jams/8/_index.html index d3d3cc0f..c510c250 100644 --- a/pydis_site/templates/events/pages/code-jams/8/_index.html +++ b/pydis_site/templates/events/pages/code-jams/8/_index.html @@ -25,7 +25,7 @@
  • Tuesday, June 15 - Form to submit theme suggestions opens
  • Monday, June 21 - The Qualifier is released
  • Friday, June 25 - Voting for the theme opens
    • -
  • Saturday, June 26 @ 12PM UTC- GitHub Bootcamp
    • +
  • Saturday, June 26 @ 4PM UTC- GitHub Bootcamp
  • Wednesday, June 30 - The Qualifier closes
  • Friday, July 9 - Code Jam begins
  • Friday, July 16 - Coding portion of the jam ends
    • -- cgit v1.2.3 From 0284db7f24fb1f624e0b548894d5248eb0eba1f5 Mon Sep 17 00:00:00 2001 From: Janine vN Date: Wed, 23 Jun 2021 22:08:37 -0400 Subject: Fix typos --- pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pydis_site/templates') diff --git a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html index bac03d11..836ed3ed 100644 --- a/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html +++ b/pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html @@ -25,14 +25,14 @@

    Session 1: Setting up Git

    This first session will run for an hour starting at 4PM UTC. It will be focused on installing and setting up git for the first time. - We'll have helpers available to help you set up git and integreated with your editor of choice. + We'll have helpers available to help you set up git and integrated with your editor of choice. Whether it's PyCharm, VSCode, or vim, we can help you get rolling with version control.

    Session 2: Using git and github in a team environment

    This session will run for an hour starting at 5PM UTC. It will be focused on using git and GitHub in a team environment. You'll be put in a group with other attendees and use the common git commands for working in a repo. - You'll learn how to set-up a GitHub reposity with other contributors, how to make branches, make commits, pull down changes, and then make pull requests. + You'll learn how to set-up a GitHub repository with other contributors, how to make branches, make commits, pull down changes, and then make pull requests. We'll also be going over different strategies for creating branches and best practices for commits and pull requests.

    -- cgit v1.2.3