Skip to content

Commit 642b5b3

Browse files
hitime1234Ren Herringashhhleyyy
authored
add new committee members 2025 (#230)
Co-authored-by: Ren Herring <[email protected]> Co-authored-by: Ash <[email protected]>
1 parent 8e7efe9 commit 642b5b3

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

templates/content/about.html.jinja2

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,31 @@
4343

4444
<dl>
4545
<dt>Chair</dt>
46-
<dd>Joe Krystek-Walton, third year computer science undergraduate</dd>
46+
<dd>Aaron Heald, second year computer science undergraduate</dd>
4747

48-
<dt>Secretary (position jointly held)</dt>
49-
<dd>Lily Amber, first year maths undergraduate</dd>
50-
<dd>Leah Millar, first year computer science and maths undergraduate</dd>
48+
<dt>Secretary </dt>
49+
<dd>Will Hall, second year computer science undergraduate</dd>
5150

5251
<dt>Treasurer</dt>
53-
<dd>Nico Pendleton, first year philosophy undergraduate</dd>
52+
<dd>Ren Herring, second year computer science undergraduate</dd>
5453

5554
<dt>Social Events Officer</dt>
56-
<dd>Lilly Brown, fourth year computer science undergraduate</dd>
55+
<dd>Iris McBride, third year computer science undergraduate</dd>
5756

5857
<dt>Academic Events Officer</dt>
5958
<dd><em>vacant</em></dd>
6059

60+
<dt>Infrastructure Officers (position jointly held)</dt>
61+
62+
<dd>Ashley Bryan, second year computer science undergraduate</dd>
63+
<dd>Aaron Heald, second year computer science undergraduate</dd>
64+
<dd>Will Hall, second year computer science undergraduate</dd>
65+
<dd>Ren Herring, second year computer science undergraduate</dd>
66+
<dd>Evelyn Gravett, second year computer science undergraduate</dd>
67+
68+
<dt>Ordinary Officer</dt>
69+
<dd>Katelyn Burberry, first year computer science undergraduate</dd>
70+
6171
<div style="display:None;">
6272
<div>Shadow Committee
6373
<dt>Brownie officer</dt>
@@ -70,7 +80,5 @@
7080
<dd>Clara</dd>
7181
</div>
7282
</div>
73-
74-
7583
</dl>
7684
{% endblock body %}

templates/content/irc.html.jinja2

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
<p>Before joining, please read our <a href="{{url_for('.render_page', page='coc')}}">Code of Conduct</a>. If you want to know more about how we use our chat platforms, read through the Guidelines and Conventions on the same page.</p>
99
<h3>Discord</h3>
1010
<p>Our primary chat platform is Discord. You can join using <a href="https://discord.gg/Kmnw2a7TTq">this link</a>.</p>
11-
<h3>Slack</h3>
12-
<p>We also have a <a href="https://hacksoc-york.slack.com/signup">Slack workspace</a>, which is bridged to many of our Discord server's channels. You can join with your @york.ac.uk email address or email <a href="mailto:[email protected]">[email protected]</a> to request access.</p>
1311
<h3>IRC</h3>
1412
<p>We have an IRC channel, connected to our Discord's #general channel. You can join the chat using Libera Chat's <a href="https://web.libera.chat/?channel=#hacksoc">webchat</a> (<strong>#hacksoc</strong> on <strong>irc.libera.chat</strong>).</p>
1513
</div>
1614

17-
<p>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 <strong>you'll miss out on most of the conversation if you're not on Discord</strong>.</p>
15+
<p>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 <strong>you'll miss out on most of the conversation if you're not on there</strong>.</p>
1816
<p>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.</p>
1917

2018
<ol>

0 commit comments

Comments
 (0)