-
Notifications
You must be signed in to change notification settings - Fork 15
add new committee members 2025 #230
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
42f3f91
add new committee members
c018011
trimmed whitespace
0a86cbe
removed whitespace
8eacc33
Update templates/content/irc.html.jinja2
hitime1234 483b7dd
removes brs and reverts unnaming for Academic
4fc7956
Merge remote-tracking branch 'refs/remotes/origin/new-committee' into…
3c20d97
added egg back in
e353b95
Update templates/content/about.html.jinja2
hitime1234 63bdc09
Update templates/content/about.html.jinja2
hitime1234 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,13 +8,11 @@ | |
| <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> | ||
| <h3>Discord</h3> | ||
| <p>Our primary chat platform is Discord. You can join using <a href="https://discord.gg/Kmnw2a7TTq">this link</a>.</p> | ||
| <h3>Slack</h3> | ||
| <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> | ||
| <h3>IRC</h3> | ||
| <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> | ||
| </div> | ||
|
|
||
| <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> | ||
| <p>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 <strong>you'll miss out on most of the conversation if you're not on Discord</strong>.</p> | ||
hitime1234 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| <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> | ||
|
|
||
| <ol> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.