From 42f3f91af335825389bd687a1d12233b4d21edad Mon Sep 17 00:00:00 2001 From: Ren Herring Date: Thu, 15 May 2025 00:02:58 +0100 Subject: [PATCH 1/8] add new committee members --- templates/content/about.html.jinja2 | 38 ++++++++++++++--------------- templates/content/irc.html.jinja2 | 4 +-- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/templates/content/about.html.jinja2 b/templates/content/about.html.jinja2 index d0848db..fa8c294 100644 --- a/templates/content/about.html.jinja2 +++ b/templates/content/about.html.jinja2 @@ -43,34 +43,34 @@
Chair
-
Joe Krystek-Walton, third year computer science undergraduate
+
Aaron Heald, second year computer science undergraduate
-
Secretary (position jointly held)
-
Lily Amber, first year maths undergraduate
-
Leah Millar, first year computer science and maths undergraduate
+
Secretary
+
Will Hall, second year computer science undergraduate
Treasurer
-
Nico Pendleton, first year philosophy undergraduate
+
Ren Herring, second year computer science undergraduate
Social Events Officer
-
Lilly Brown, fourth year computer science undergraduate
+
Iris McBride, third year computer science undergraduate
Academic Events Officer
-
vacant
+
Unfilled
-
-
Shadow Committee -
Brownie officer
-
atlie
- -
Mario and Doom officer
-
Jess
- -
filmbro
-
Clara
-
-
+
Infrastructure Officers (positions jointly held x2)
+ +
Ashley Bryan, second year computer science undergraduate
+
+
Aaron Heald, second year computer science undergraduate
+
Will Hall, second year computer science undergraduate
+
+
Ren Herring, second year computer science undergraduate
+
Evelyn Gravett, second year computer science undergraduate
+
+ +
Ordinary Officer
+
Katelyn Burberry, first year computer science undergraduate
{% endblock body %} diff --git a/templates/content/irc.html.jinja2 b/templates/content/irc.html.jinja2 index 945f27d..a394b3d 100644 --- a/templates/content/irc.html.jinja2 +++ b/templates/content/irc.html.jinja2 @@ -8,13 +8,11 @@

Before joining, please read our Code of Conduct. If you want to know more about how we use our chat platforms, read through the Guidelines and Conventions on the same page.

Discord

Our primary chat platform is Discord. You can join using this link.

-

Slack

-

We also have a Slack workspace, which is bridged to many of our Discord server's channels. You can join with your @york.ac.uk email address or email hack@yusu.org to request access.

IRC

We have an IRC channel, connected to our Discord's #general channel. You can join the chat using Libera Chat's webchat (#hacksoc on irc.libera.chat).

-

Our chat system of choice is Discord. However, we've kept the option of using our legacy platforms of Slack and IRC. Note that, whilst a few channels are bridged between Discord, IRC, and Slack, there are plenty that aren't, and you'll miss out on most of the conversation if you're not on Discord.

+

Our chat system of choice is Discord. However, we've kept the option of using our legacy platforms of IRC. Note that, whilst a few channels are bridged between Discord, IRC, there are plenty that aren't, and you'll miss out on most of the conversation if you're not on Discord.

IRC, or Internet Relay Chat, is a protocol with a long and glorious history stretching back into the mists of time. It's a pretty simple system for online chatrooms, and you don't even need a special program to connect to it, although they do exist.

    From c018011dbeb755bbbe5341eef6554296af15d951 Mon Sep 17 00:00:00 2001 From: Ren Herring Date: Thu, 15 May 2025 16:30:39 +0100 Subject: [PATCH 2/8] trimmed whitespace --- templates/content/about.html.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/content/about.html.jinja2 b/templates/content/about.html.jinja2 index fa8c294..34233d5 100644 --- a/templates/content/about.html.jinja2 +++ b/templates/content/about.html.jinja2 @@ -55,7 +55,7 @@
    Iris McBride, third year computer science undergraduate
    Academic Events Officer
    -
    Unfilled
    +
    Unfilled
    Infrastructure Officers (positions jointly held x2)
    From 0a86cbeff867764fa46677ef690e097e7f52b234 Mon Sep 17 00:00:00 2001 From: Ren Herring Date: Thu, 15 May 2025 16:43:15 +0100 Subject: [PATCH 3/8] removed whitespace --- templates/content/about.html.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/content/about.html.jinja2 b/templates/content/about.html.jinja2 index 34233d5..4de55f3 100644 --- a/templates/content/about.html.jinja2 +++ b/templates/content/about.html.jinja2 @@ -59,7 +59,7 @@
    Infrastructure Officers (positions jointly held x2)
    -
    Ashley Bryan, second year computer science undergraduate
    +
    Ashley Bryan, second year computer science undergraduate

    Aaron Heald, second year computer science undergraduate
    Will Hall, second year computer science undergraduate
    From 8eacc33b1a2108c29a5097fd542e79998ddc5d9e Mon Sep 17 00:00:00 2001 From: Ren Date: Thu, 15 May 2025 17:26:53 +0100 Subject: [PATCH 4/8] Update templates/content/irc.html.jinja2 looks good Co-authored-by: Ash --- templates/content/irc.html.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/content/irc.html.jinja2 b/templates/content/irc.html.jinja2 index a394b3d..79b0048 100644 --- a/templates/content/irc.html.jinja2 +++ b/templates/content/irc.html.jinja2 @@ -12,7 +12,7 @@

    We have an IRC channel, connected to our Discord's #general channel. You can join the chat using Libera Chat's webchat (#hacksoc on irc.libera.chat).

    -

    Our chat system of choice is Discord. However, we've kept the option of using our legacy platforms of IRC. Note that, whilst a few channels are bridged between Discord, IRC, there are plenty that aren't, and you'll miss out on most of the conversation if you're not on Discord.

    +

    Our chat system of choice is Discord. However, we've kept the option of using our old IRC channel too. Note that while the IRC channel is bridged to Discord, there are other channels that are only on Discord, and you'll miss out on most of the conversation if you're not on there.

    IRC, or Internet Relay Chat, is a protocol with a long and glorious history stretching back into the mists of time. It's a pretty simple system for online chatrooms, and you don't even need a special program to connect to it, although they do exist.

      From 483b7dd7a56fc80a225072c49737604980457767 Mon Sep 17 00:00:00 2001 From: Ren Herring Date: Thu, 15 May 2025 17:30:40 +0100 Subject: [PATCH 5/8] removes brs and reverts unnaming for Academic --- templates/content/about.html.jinja2 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/content/about.html.jinja2 b/templates/content/about.html.jinja2 index 4de55f3..d0a93e5 100644 --- a/templates/content/about.html.jinja2 +++ b/templates/content/about.html.jinja2 @@ -55,19 +55,15 @@
      Iris McBride, third year computer science undergraduate
      Academic Events Officer
      -
      Unfilled
      +
      vacant
      Infrastructure Officers (positions jointly held x2)
      Ashley Bryan, second year computer science undergraduate
      -
      Aaron Heald, second year computer science undergraduate
      Will Hall, second year computer science undergraduate
      -
      Ren Herring, second year computer science undergraduate
      Evelyn Gravett, second year computer science undergraduate
      -
      -
      Ordinary Officer
      Katelyn Burberry, first year computer science undergraduate
      From 3c20d97d52f620f999bd2070e1a0465d576fecef Mon Sep 17 00:00:00 2001 From: Ren Herring Date: Thu, 15 May 2025 17:34:01 +0100 Subject: [PATCH 6/8] added egg back in --- templates/content/about.html.jinja2 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/templates/content/about.html.jinja2 b/templates/content/about.html.jinja2 index d0a93e5..07e9287 100644 --- a/templates/content/about.html.jinja2 +++ b/templates/content/about.html.jinja2 @@ -68,5 +68,17 @@
      Ordinary Officer
      Katelyn Burberry, first year computer science undergraduate
      +
      +
      Shadow Committee +
      Brownie officer
      +
      atlie
      + +
      Mario and Doom officer
      +
      Jess
      + +
      filmbro
      +
      Clara
      +
      +
      {% endblock body %} From e353b952056eb961735d8e34313de44bb987752f Mon Sep 17 00:00:00 2001 From: Ren Date: Thu, 15 May 2025 19:25:58 +0100 Subject: [PATCH 7/8] Update templates/content/about.html.jinja2 Co-authored-by: Ash --- templates/content/about.html.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/content/about.html.jinja2 b/templates/content/about.html.jinja2 index 07e9287..680452c 100644 --- a/templates/content/about.html.jinja2 +++ b/templates/content/about.html.jinja2 @@ -57,7 +57,7 @@
      Academic Events Officer
      vacant
      -
      Infrastructure Officers (positions jointly held x2)
      +
      Infrastructure Officers (position jointly held)
      Ashley Bryan, second year computer science undergraduate
      Aaron Heald, second year computer science undergraduate
      From 63bdc093053ce105e2de1adfb34c1dff577590ec Mon Sep 17 00:00:00 2001 From: Ren Date: Thu, 15 May 2025 21:37:32 +0100 Subject: [PATCH 8/8] Update templates/content/about.html.jinja2 Co-authored-by: Ash --- templates/content/about.html.jinja2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/content/about.html.jinja2 b/templates/content/about.html.jinja2 index 680452c..559d7b5 100644 --- a/templates/content/about.html.jinja2 +++ b/templates/content/about.html.jinja2 @@ -69,7 +69,7 @@
      Katelyn Burberry, first year computer science undergraduate
      -
      Shadow Committee +
      Shadow Committee
      Brownie officer
      atlie