Skip to content

Sync master back up to dev (it's broken :)) #375

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.

Sign up for GitHub

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 8 commits into from
Nov 14, 2025
Merged

Sync master back up to dev (it's broken :)) #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f39ffd9
Merge pull request #357 from ComputerScienceHouse/develop
charlottegeo Mar 7, 2025
a942420
httpd: allow overriding indexes
Mstrodl Mar 10, 2025
7ebc57e
httpd: enable AutoIndex fancy icons
Mstrodl Mar 10, 2025
832311d
Merge pull request #359 from ComputerScienceHouse/develop
tallen42 Apr 25, 2025
c2a9f45
Merge pull request #363 from ComputerScienceHouse/develop
Qelxiros Jun 1, 2025
4a2e55f
Merge pull request #366 from ComputerScienceHouse/develop
tallen42 Aug 17, 2025
b44f027
Merge pull request #368 from ComputerScienceHouse/develop
goosenotduck Nov 3, 2025
4e48f8e
Update financial director
pikachu0542 Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion about/eboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ <h3>Ian Kopke</h3>
</div>
<div class="col-12 col-lg-9">
<h2 class="header">Financial</h2>
<h3>Isaac Ingram</h3>
<h3>Matthew Wilkins</h3>
<p class="long-form">
Financial is responsible for managing CSH's finances, collecting semesterly member
dues, and hatching new fundraising schemes.
Expand Down
3 changes: 3 additions & 0 deletions httpd-suffix.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
Include conf/extra/httpd-autoindex.conf

AddDefaultCharset utf-8
LoadModule userdir_module modules/mod_userdir.so
UserDir public_html
<Directory />
#php_admin_value engine Off
Options all MultiViews -Indexes
AllowOverride Options=Indexes
DirectoryIndex index.html index.htm
<FilesMatch "\.php$">
Require all denied
Expand Down