Merge branch 'main' into dev

hiss/application/forms.py

@@ -254,7 +254,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
         photo_agreement = "I grant permission for TAMUhack to use my name, likeness, voice, and any photographs, video recordings, or audio recordings taken during the event 'TAMUhack 2025' for promotional and media purposes, including but not limited to publications, websites, social media, and press releases."
-        accessibilities = "Please check this box if you require any accommodations to ensure accessibility during this event. Our team will follow up to discuss your needs."
+        accessibilities = "Please check this box you would like our team to follow up with you personally to discuss your accessibility accommodations during this event."
 
         self.fields["agree_to_photos"].label = mark_safe(photo_agreement)
         self.fields["accessibility_requirements"].label = mark_safe(accessibilities)
@@ -369,13 +369,13 @@ class Meta:
             # "question2",
             # "question3",
             "additional_accommodations",
+            "accessibility_requirements",
             "emergency_contact_name",
             "emergency_contact_relationship",
             "emergency_contact_phone",
             "emergency_contact_email",
             "notes",
             "agree_to_photos",
-            "accessibility_requirements",
             "agree_to_coc",
             "agree_to_mlh_stuff",
             "signup_to_mlh_newsletter",

hiss/application/models.py

@@ -482,7 +482,7 @@ class Application(models.Model):
         "How many hackathons have you attended?", max_length=22, choices=HACKATHON_TIMES
     )
     wares = models.CharField(
-        "TAMUhack will be partnering with IEEE to offer a dedicated hardware track and prizes. Participants can choose to compete in this track or in the general software tracks. Would you like to compete in the software or hardware track", choices=WARECHOICE, max_length=8, default=NO_ANSWER, blank=True, null=True
+        "TAMUhack will be partnering with IEEE to offer a dedicated hardware track and prizes. Participants can choose to compete in this track or in the general software tracks. Would you like to compete in the software or hardware track", choices=WARECHOICE, max_length=8, default=NO_ANSWER, blank=False, null=True
     )
     # LEGAL INFO
     agree_to_coc = models.BooleanField(choices=AGREE, default=None)