diff --git a/templates/content/about.html.jinja2 b/templates/content/about.html.jinja2 index d0848db..559d7b5 100644 --- a/templates/content/about.html.jinja2 +++ b/templates/content/about.html.jinja2 @@ -43,21 +43,31 @@
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
+
Infrastructure Officers (position jointly held)
+ +
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
+
Shadow Committee
Brownie officer
@@ -70,7 +80,5 @@
Clara
- -
{% endblock body %} diff --git a/templates/content/irc.html.jinja2 b/templates/content/irc.html.jinja2 index 945f27d..79b0048 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 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.