Skip to content

Commit 4e58cc8

Browse files
Merge main into hoodies
2 parents 32104d3 + 6b085a2 commit 4e58cc8

22 files changed

+87
-88
lines changed

Gemfile.lock

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.7)
5-
public_suffix (>= 2.0.2, < 7.0)
4+
addressable (2.8.8)
5+
public_suffix (>= 2.0.2, < 8.0)
66
base64 (0.3.0)
77
bigdecimal (3.3.1)
88
colorator (1.1.0)
9-
concurrent-ruby (1.3.5)
9+
concurrent-ruby (1.3.6)
1010
csv (3.3.5)
1111
em-websocket (0.5.3)
1212
eventmachine (>= 0.12.9)
@@ -24,31 +24,31 @@ GEM
2424
ffi (1.17.2-x86_64-linux-gnu)
2525
ffi (1.17.2-x86_64-linux-musl)
2626
forwardable-extended (2.6.0)
27-
google-protobuf (4.33.0)
27+
google-protobuf (4.33.2)
2828
bigdecimal
2929
rake (>= 13)
30-
google-protobuf (4.33.0-aarch64-linux-gnu)
30+
google-protobuf (4.33.2-aarch64-linux-gnu)
3131
bigdecimal
3232
rake (>= 13)
33-
google-protobuf (4.33.0-aarch64-linux-musl)
33+
google-protobuf (4.33.2-aarch64-linux-musl)
3434
bigdecimal
3535
rake (>= 13)
36-
google-protobuf (4.33.0-arm64-darwin)
36+
google-protobuf (4.33.2-arm64-darwin)
3737
bigdecimal
3838
rake (>= 13)
39-
google-protobuf (4.33.0-x86-linux-gnu)
39+
google-protobuf (4.33.2-x86-linux-gnu)
4040
bigdecimal
4141
rake (>= 13)
42-
google-protobuf (4.33.0-x86-linux-musl)
42+
google-protobuf (4.33.2-x86-linux-musl)
4343
bigdecimal
4444
rake (>= 13)
45-
google-protobuf (4.33.0-x86_64-darwin)
45+
google-protobuf (4.33.2-x86_64-darwin)
4646
bigdecimal
4747
rake (>= 13)
48-
google-protobuf (4.33.0-x86_64-linux-gnu)
48+
google-protobuf (4.33.2-x86_64-linux-gnu)
4949
bigdecimal
5050
rake (>= 13)
51-
google-protobuf (4.33.0-x86_64-linux-musl)
51+
google-protobuf (4.33.2-x86_64-linux-musl)
5252
bigdecimal
5353
rake (>= 13)
5454
http_parser.rb (0.8.0)
@@ -81,7 +81,7 @@ GEM
8181
jekyll (>= 3.8, < 5.0)
8282
jekyll-watch (2.2.1)
8383
listen (~> 3.0)
84-
json (2.15.2)
84+
json (2.18.0)
8585
kramdown (2.5.1)
8686
rexml (>= 3.3.9)
8787
kramdown-parser-gfm (1.1.0)
@@ -94,49 +94,49 @@ GEM
9494
mercenary (0.4.0)
9595
pathutil (0.16.2)
9696
forwardable-extended (~> 2.6)
97-
public_suffix (6.0.2)
97+
public_suffix (7.0.0)
9898
rake (13.3.1)
9999
rb-fsevent (0.11.2)
100100
rb-inotify (0.11.1)
101101
ffi (~> 1.0)
102102
rexml (3.4.4)
103103
rouge (4.6.1)
104104
safe_yaml (1.0.5)
105-
sass-embedded (1.93.2)
105+
sass-embedded (1.96.0)
106106
google-protobuf (~> 4.31)
107107
rake (>= 13)
108-
sass-embedded (1.93.2-aarch64-linux-android)
108+
sass-embedded (1.96.0-aarch64-linux-android)
109109
google-protobuf (~> 4.31)
110-
sass-embedded (1.93.2-aarch64-linux-gnu)
110+
sass-embedded (1.96.0-aarch64-linux-gnu)
111111
google-protobuf (~> 4.31)
112-
sass-embedded (1.93.2-aarch64-linux-musl)
112+
sass-embedded (1.96.0-aarch64-linux-musl)
113113
google-protobuf (~> 4.31)
114-
sass-embedded (1.93.2-arm-linux-androideabi)
114+
sass-embedded (1.96.0-arm-linux-androideabi)
115115
google-protobuf (~> 4.31)
116-
sass-embedded (1.93.2-arm-linux-gnueabihf)
116+
sass-embedded (1.96.0-arm-linux-gnueabihf)
117117
google-protobuf (~> 4.31)
118-
sass-embedded (1.93.2-arm-linux-musleabihf)
118+
sass-embedded (1.96.0-arm-linux-musleabihf)
119119
google-protobuf (~> 4.31)
120-
sass-embedded (1.93.2-arm64-darwin)
120+
sass-embedded (1.96.0-arm64-darwin)
121121
google-protobuf (~> 4.31)
122-
sass-embedded (1.93.2-riscv64-linux-android)
122+
sass-embedded (1.96.0-riscv64-linux-android)
123123
google-protobuf (~> 4.31)
124-
sass-embedded (1.93.2-riscv64-linux-gnu)
124+
sass-embedded (1.96.0-riscv64-linux-gnu)
125125
google-protobuf (~> 4.31)
126-
sass-embedded (1.93.2-riscv64-linux-musl)
126+
sass-embedded (1.96.0-riscv64-linux-musl)
127127
google-protobuf (~> 4.31)
128-
sass-embedded (1.93.2-x86_64-darwin)
128+
sass-embedded (1.96.0-x86_64-darwin)
129129
google-protobuf (~> 4.31)
130-
sass-embedded (1.93.2-x86_64-linux-android)
130+
sass-embedded (1.96.0-x86_64-linux-android)
131131
google-protobuf (~> 4.31)
132-
sass-embedded (1.93.2-x86_64-linux-gnu)
132+
sass-embedded (1.96.0-x86_64-linux-gnu)
133133
google-protobuf (~> 4.31)
134-
sass-embedded (1.93.2-x86_64-linux-musl)
134+
sass-embedded (1.96.0-x86_64-linux-musl)
135135
google-protobuf (~> 4.31)
136136
terminal-table (3.0.2)
137137
unicode-display_width (>= 1.1.1, < 3)
138138
unicode-display_width (2.6.0)
139-
webrick (1.9.1)
139+
webrick (1.9.2)
140140

141141
PLATFORMS
142142
aarch64-linux-android

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ square for best results.
118118
### Calendar Events
119119

120120
The calendar events are accessed from the public CSS Google calendar also
121-
available [here][calendar]. They are accessed from the calendar using
121+
available [on the calendar page][calendar]. They are accessed from the calendar using
122122
[FullCalendar][fullcalendar] and an API key managed from the Google Cloud
123123
Console.
124124

_collections/_clubs/2021-11-26-discord-botathon.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ header-image: /assets/images/botathon.jpg
66
Following the growing success of our [Discord server](/di), we ran 2 related Discord Bot events.
77

88

9-
#### Discord Bot Workshop
9+
## Discord Bot Workshop
1010

1111
On Friday evening, we gave members a crash course on all things `discord.py`, giving them all the tools they needed to make a discord bot themselves.
1212
We also recorded an [online version](https://youtu.be/yVxKmp40sjo) for people who couldn't attend in person.
1313

1414

15-
#### Discord Botathon
15+
## Discord Botathon
1616

1717
On the Saturday, we ran a 5 hour Discord Bot Hackathon with teams making their own bot using knowledge from the day before.
1818
The winners won a Raspberry Pi Zero each, but everyone was the real winners as we all got plenty of pizza.

_collections/_events/tex-talks.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ computer science!
1010
In the past we've had talks on hacking your printer, breaking popular anti-cheat
1111
systems, various cloud technologies, applied robotics, and more.
1212

13-
If you're curious, you can check out the schedule for a previous edition
14-
[here](/tex-talks).
13+
If you're curious, you can check out the [schedule](/tex-talks) for previous editions.

_collections/_news/2019-08-14-website-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ So what's actually on this new and flashy website?
3535

3636
We're going to continue working on more stuff on this site and improving it
3737
more and more, but the main work is done now. If you're interested in helping
38-
out, you can checkout the GitHub [here](https://github.com/CSSUoB/cssuob.github.io/).
38+
out, you can checkout the [GitHub](https://github.com/CSSUoB/cssuob.github.io/).
3939

4040
## Tech stack
4141

_collections/_news/2019-09-09-freshers-week-2019.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Time and Date: Wednesday 25<sup>th</sup> September, 13:00
3939

4040
Location: Ming Moon Restaurant, 16 Hurst St, Birmingham B5 4BN
4141

42-
Facebook Event: [link](https://www.facebook.com/events/2503094343110792/)
42+
[Facebook Event](https://www.facebook.com/events/2503094343110792/)
4343

4444
### Pub Night
4545

@@ -49,7 +49,7 @@ Time and Date: Friday 27<sup>th</sup> September, 18:30
4949

5050
Location: (Upstairs in the) Bristol Pear, 676 Bristol Rd, Birmingham B29 6BJ
5151

52-
Facebook Event: [link](https://www.facebook.com/events/416995638948699/)
52+
[Facebook Event](https://www.facebook.com/events/416995638948699/)
5353

5454
### Welcome Talks
5555

@@ -59,7 +59,7 @@ Time and Date: Wednesday 2<sup>nd</sup> October, 15:00
5959

6060
Location: Sloman Lounge, School of Computer Science
6161

62-
Facebook Event: [link](https://www.facebook.com/events/405818026794421/)
62+
[Facebook Event](https://www.facebook.com/events/405818026794421/)
6363

6464
### EPS Societies' Fair
6565

@@ -75,7 +75,7 @@ Get a mini-taster into the world of hackathons! This year, MLH (Major League Hac
7575

7676
This event is run in coperation with Aston Computer Science Society at Aston Univeristy, and Hackathon and Computing Society at Birmingham City Univeristy.
7777

78-
Find out more [here](https://localhackday.mlh.io/learn/).
78+
Find out more on the [MLH website](https://localhackday.mlh.io/learn/).
7979

8080
Time and Date: Saturday 12<sup>th</sup> October
8181

@@ -85,7 +85,7 @@ Location: School of Computer Science
8585

8686
We're working with AFNOM to bring you a Linux install workshop. Linux is the preferred operating system of many developers and many students aren't super familiar with it at the start of the year. This workshop is designed to help you become familiar with Linux and how to start using it.
8787

88-
AFNOM is one of the EPS Societies, and you can find more out about them here: [link](https://afnom.net)
88+
AFNOM is one of the EPS Societies, and you can find more out about them on their [website](https://afnom.net)
8989

9090
Time and Date: Wednesday 16<sup>th</sup> October 15:00 - 18:00
9191

@@ -119,15 +119,15 @@ Time and Date: Saturday 26<sup>th</sup> October 9:00 - Sunday 27<sup>th</sup> Oc
119119

120120
Location: Millennium Point, Curzon Street, Birmingham, B4 7XG
121121

122-
Facebook Event: [link](https://www.facebook.com/events/629434650857932/)
122+
[Facebook Event](https://www.facebook.com/events/629434650857932/)
123123

124124
## Become a Member
125125

126126
If you are interested in the events we run and would like to join the society to have access to all of the great events we run later in the year, then you can join through the Guild Of Students - our students' union at the university.
127127

128128
You can join for only £5 for the year, and as a bonus you'll get a free tshirt! More info on how to collect your tshirt soon. If you aren't quite sure whether you want to join us, then come along to our events during the start of the semester. They're all open and incusive to everyone.
129129

130-
Join here: [link](https://cssbham.com/join)
130+
Join on the [Guild Website](https://cssbham.com/join)
131131

132132
We also invite you to follow us on all of our social media channels, where we will post updates about all of the most recent events.
133133

@@ -143,7 +143,7 @@ LinkedIn: [cssbham](https://linkedin.com/company/cssbham)
143143

144144
Over the summer, Justin (our vice-president) has been hard at work reworking our website. He's added some great new features such as the [newsletters](https://cssbham.com/newsletter) you're reading now and a [calendar](https://cssbham.com/calendar) where you can find all of our events in one place.
145145

146-
Have a read of what Justin has to say about the website in his blog post [here](https://cssbham.com/newsletter/website-update).
146+
Have a read of what Justin has to say about the website in his [blog post](https://cssbham.com/newsletter/website-update).
147147

148148
---
149149

_collections/_news/2019-11-01-october-2019.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ Kainos have also opened applications for placement years and graduate roles and
5151

5252
The upcoming Societies' Night will be held at the Guild on Wednesday 20th November. Tickets will be £4 with £1 going back towards societies. CSS will be hosting a gathering before this event, and details about tickets and the CSS costume theme will become available soon.
5353

54-
In the meantime, you can join the Guild Facebook event [here](https://www.facebook.com/events/806462179789020/).
54+
In the meantime, you can join the [Guild Facebook event](https://www.facebook.com/events/806462179789020/).

_collections/_news/2020-04-22-agm-2020-intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Currently, we are holding our elections for next year's committee as part of our
1010

1111
All society members are eligible to run for a role on the committee. The elections run throughout this week and next week. Those who want to run for a position can nominate themselves on the [Guild website](https://guildofstudents.com/vote), until Friday 24th April, 4pm. The nominated members are then voted in between 12pm on Monday 27th and 4pm on Wednesday 27th April. Voting will also take place on the Guild website.
1212

13-
Although we, as committee members, all work together in one big team, each role also has its own individual responsibilities - from taking care of the finances, to publicising all of the events. Being a committee member takes a lot of time and effort, but I would say it is definitely worth the outcome. The society, committee and our elections are governed by our Constitution, which you can read in full [here](https://docs.google.com/document/d/1J3_EWs3dd2gq5T_xYylcP5pDzm0HHAYCTgiqKUYwkls/edit).
13+
Although we, as committee members, all work together in one big team, each role also has its own individual responsibilities - from taking care of the finances, to publicising all of the events. Being a committee member takes a lot of time and effort, but I would say it is definitely worth the outcome. The society, committee and our elections are governed by our Constitution, which you can read in [full](/constitution).
1414

1515
## President
1616

_collections/_news/2020-04-26-agm-2020-reports.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ header-image: /assets/images/committee1920.jpg
88

99
The Covid-19 pandemic has caused a lot of disruption worldwide to everybody, CSS included. Usually we would hold our Committee Elections in March as part of our Annual General Meeting. The AGM was planned to take place on Tuesday 17th March 2020. We were aware that due to the impending restrictions which would come, many society members may have already travelled home or would not want to meet at an event. Therefore, we decided to postpone the meeting until such a time we could hold a meeting and election in such a way that it would be fair and inclusive.
1010

11-
In the regular AGM, we would give a report of the year from the President and Treasurer as outlined in our [Constitution](https://docs.google.com/document/d/1J3_EWs3dd2gq5T_xYylcP5pDzm0HHAYCTgiqKUYwkls/edit). As we are now holding our Elections online, we are also publishing these reports online. The Reports below outline what CSS has done since the current committee were elected in Spring 2019 and a summary of our financial position.
11+
In the regular AGM, we would give a report of the year from the President and Treasurer as outlined in our [Constitution](/constitution). As we are now holding our Elections online, we are also publishing these reports online. The Reports below outline what CSS has done since the current committee were elected in Spring 2019 and a summary of our financial position.
1212

1313
## The Reports
1414

0 commit comments

Comments
 (0)