Merge branch 'main' into compress-images-correctly

uclaacm · Apr 16, 2024 · a70ece0 · a70ece0
2 parents d992caf + 6caaa37
commit a70ece0
Show file tree

Hide file tree

Showing 67 changed files with 840 additions and 808 deletions.
diff --git a/data/events.json b/data/events.json
diff --git a/pages/join.tsx b/pages/join.tsx
@@ -30,7 +30,7 @@ export default function Join() {
 
           <button className={styles.membershipForm}>
             <a href="https://www.google.com/a/g.ucla.edu/ServiceLogin?continue=https://docs.google.com/forms/d/e/1FAIpQLSd40YVQqKPlcne_h1NtElVLuFuikdtPirRF8GazpiiAejbnXw/viewform?usp=sf_link">
-              Winter 2024 Membership Form
+              Spring 2024 Membership Form
             </a>
           </button>
 

diff --git a/public/images/archive/archive.svg b/public/images/archive/archive.svg
diff --git a/public/images/archive/s23/aaron.jpg b/public/images/archive/s23/aaron.jpg
diff --git a/public/images/archive/s23/ca1.png b/public/images/archive/s23/ca1.png
diff --git a/public/images/archive/s23/ca2.png b/public/images/archive/s23/ca2.png
diff --git a/public/images/archive/s23/ca3.jpg b/public/images/archive/s23/ca3.jpg
diff --git a/public/images/archive/s23/ca4.png b/public/images/archive/s23/ca4.png
diff --git a/public/images/archive/s23/gm.jpg b/public/images/archive/s23/gm.jpg
diff --git a/public/images/archive/s23/javacipher.jpg b/public/images/archive/s23/javacipher.jpg
diff --git a/public/images/archive/s23/liveoverflow.png b/public/images/archive/s23/liveoverflow.png
diff --git a/public/images/archive/s23/malware1.jpg b/public/images/archive/s23/malware1.jpg
diff --git a/public/images/archive/s23/malware2.jpeg b/public/images/archive/s23/malware2.jpeg
diff --git a/public/images/archive/s23/malware3.jpeg b/public/images/archive/s23/malware3.jpeg
diff --git a/public/images/archive/s23/malware4.jpeg b/public/images/archive/s23/malware4.jpeg
diff --git a/public/images/archive/s23/mariokart.jpeg b/public/images/archive/s23/mariokart.jpeg
diff --git a/public/images/archive/s23/os1.jpg b/public/images/archive/s23/os1.jpg
diff --git a/public/images/archive/s23/os2.jpg b/public/images/archive/s23/os2.jpg
diff --git a/public/images/archive/s23/os3.png b/public/images/archive/s23/os3.png
diff --git a/public/images/archive/s23/sanjana.png b/public/images/archive/s23/sanjana.png
diff --git a/public/images/archive/s23/swexcyber.jpg b/public/images/archive/s23/swexcyber.jpg
diff --git a/public/images/archive/s23/william.jpg b/public/images/archive/s23/william.jpg
diff --git a/public/images/archive/w23/ai-security.png b/public/images/archive/w23/ai-security.png
diff --git a/public/images/archive/w23/ca1.png b/public/images/archive/w23/ca1.png
diff --git a/public/images/archive/w23/ca2.png b/public/images/archive/w23/ca2.png
diff --git a/public/images/archive/w23/ca3.png b/public/images/archive/w23/ca3.png
diff --git a/public/images/archive/w23/ca4.png b/public/images/archive/w23/ca4.png
diff --git a/public/images/archive/w23/ca5.png b/public/images/archive/w23/ca5.png
diff --git a/public/images/archive/w23/game-hacking.png b/public/images/archive/w23/game-hacking.png
diff --git a/public/images/archive/w23/la-ctf.jpeg b/public/images/archive/w23/la-ctf.jpeg
diff --git a/public/images/archive/w23/modern-crypto.png b/public/images/archive/w23/modern-crypto.png
diff --git a/public/images/archive/w23/social.jpeg b/public/images/archive/w23/social.jpeg
diff --git a/public/images/archive/w23/winter-gm.jpeg b/public/images/archive/w23/winter-gm.jpeg
diff --git a/public/images/archive/w23/yuan.png b/public/images/archive/w23/yuan.png
diff --git a/public/images/events/acm-gm-f23.png b/public/images/events/acm-gm-f23.png
diff --git a/public/images/events/gm-f23.png b/public/images/events/gm-f23.png
diff --git a/public/images/events/w24/w24-acm-gm.png b/public/images/events/w24/w24-acm-gm.png
diff --git a/public/images/events/w24/w24-ai-x-cyber-symposium.png b/public/images/events/w24/w24-ai-x-cyber-symposium.png
diff --git a/public/images/events/w24/w24-beginner-ctf.png b/public/images/events/w24/w24-beginner-ctf.png
diff --git a/public/images/events/w24/w24-browser-binary-exploitation.png b/public/images/events/w24/w24-browser-binary-exploitation.png
diff --git a/public/images/events/w24/w24-burpsuite-talk.png b/public/images/events/w24/w24-burpsuite-talk.png
diff --git a/public/images/events/w24/w24-coppersmiths-attack.png b/public/images/events/w24/w24-coppersmiths-attack.png
diff --git a/public/images/events/w24/w24-cpu-vulns.png b/public/images/events/w24/w24-cpu-vulns.png
diff --git a/public/images/events/w24/w24-cyber-potluck-social.png b/public/images/events/w24/w24-cyber-potluck-social.png
diff --git a/public/images/events/w24/w24-economics.png b/public/images/events/w24/w24-economics.png
diff --git a/public/images/events/w24/w24-ectf-week2.png b/public/images/events/w24/w24-ectf-week2.png
diff --git a/public/images/events/w24/w24-ectf-week3.png b/public/images/events/w24/w24-ectf-week3.png
diff --git a/public/images/events/w24/w24-ectf-week4.png b/public/images/events/w24/w24-ectf-week4.png
diff --git a/public/images/events/w24/w24-ectf-week5.png b/public/images/events/w24/w24-ectf-week5.png
diff --git a/public/images/events/w24/w24-ectf-week6.png b/public/images/events/w24/w24-ectf-week6.png
diff --git a/public/images/events/w24/w24-ectf-week7.png b/public/images/events/w24/w24-ectf-week7.png
diff --git a/public/images/events/w24/w24-ectf-week8.png b/public/images/events/w24/w24-ectf-week8.png
diff --git a/public/images/events/w24/w24-ectf-week9.png b/public/images/events/w24/w24-ectf-week9.png
diff --git a/public/images/events/w24/w24-firmware-rev.png b/public/images/events/w24/w24-firmware-rev.png
diff --git a/public/images/events/w24/w24-font-injection.png b/public/images/events/w24/w24-font-injection.png
diff --git a/public/images/events/w24/w24-formal-verification.png b/public/images/events/w24/w24-formal-verification.png
diff --git a/public/images/events/w24/w24-gm.png b/public/images/events/w24/w24-gm.png
diff --git a/public/images/events/w24/w24-heap-binary-exploitation.png b/public/images/events/w24/w24-heap-binary-exploitation.png
diff --git a/public/images/events/w24/w24-lactf.png b/public/images/events/w24/w24-lactf.png
diff --git a/public/images/events/w24/w24-laurie-kirk.png b/public/images/events/w24/w24-laurie-kirk.png
diff --git a/public/images/events/w24/w24-operation-triangulation.png b/public/images/events/w24/w24-operation-triangulation.png
diff --git a/public/images/events/w24/w24-race-conditions.png b/public/images/events/w24/w24-race-conditions.png
diff --git a/public/images/events/w24/w24-ssti-and-pyjails.png b/public/images/events/w24/w24-ssti-and-pyjails.png
diff --git a/public/images/events/w24/w24-strellic.png b/public/images/events/w24/w24-strellic.png
diff --git a/public/images/events/w24/w24-symmetric-crypto.png b/public/images/events/w24/w24-symmetric-crypto.png
diff --git a/public/images/events/w24/w24-weijia-yan.png b/public/images/events/w24/w24-weijia-yan.png
diff --git a/public/images/events/w24/w24-windows-rev.png b/public/images/events/w24/w24-windows-rev.png