Merge dev into main #418

pikachu0542 · 2025-10-21T12:38:42Z

No description provided.

glue

* migration, url fixes * chom

* chom * chom

* Revert "packet glue (#407)" This reverts commit 2b4bc44. * Revert "chom (#406)" This reverts commit 8a6b501. * Revert "chom (#405)" This reverts commit a904044. * Revert "packet glue (#404)" This reverts commit ee6fc41. * Revert "migration, url fixes (#403)" This reverts commit 736d203. * Revert "Merge pull request #402 from Qelxiros/packet-glue" This reverts commit 0fc55d5, reversing changes made to 4fe950f. * Revert "glue (#401)" This reverts commit 4fe950f. * Revert "packet glue but again (navbar yippee) (#400)" This reverts commit 49c7bab. * Revert "packet glue but even more (#399)" This reverts commit 55ea7f8. * Revert "Merge pull request #398 from Qelxiros/packet-glue" This reverts commit 416bc10, reversing changes made to baf42df. * Revert "packet glue but again (#397)" This reverts commit baf42df. * Revert "Merge pull request #396 from Qelxiros/packet-glue" This reverts commit f936afd, reversing changes made to d3a0280.

add css animation to dropdown arrows

…6 weeks

gatekeep

* move gatekeep_status to members.py * Fix errors in gatekeep_status * Fix unused import, fix logic error * Remove duplicate imports * Remove non-existent options from lint

BigSpaceships · 2025-10-21T13:51:28Z

conditional/util/member.py

+        "h_meetings": h_meetings,
+        "c_meetings": d_meetings,
+        "t_seminars": t_seminars,
+    }, 200


Can we move the response code to the actual route? This seems like it could maybe be a useful function to have independent of the actual route logic and to me it makes more sense at least

That's actually so real 👍 Big agree

BigSpaceships

Overall looks good I messed up my one comment but little nitpick stuff

BigSpaceships · 2025-10-21T13:53:05Z

conditional/__init__.py

+
+

I think we probably should get rid of the whitespace

goosenotduck

Overall looks good, agree with @BigSpaceships's proposed changes

didn't look at dependency stuff

goosenotduck · 2025-10-21T14:21:01Z

Dockerfile

@@ -1,5 +1,5 @@
-FROM docker.io/python:3.8-buster
-MAINTAINER Devin Matte <matted@csh.rit.edu>
+FROM docker.io/python:3.12-bookworm


3.12-bookworm is a pretty big image has has a lot of vulns, could a slim image be used here(10x smaller)?
https://hub.docker.com/_/python/tags?name=3.12

I agree that this is a good idea, but I feel like that change is out of scope of this PR

+1 definitely out of scope

goosenotduck · 2025-10-21T14:22:57Z

conditional/blueprints/member_management.py

 import io
 from datetime import datetime
-from distutils.util import strtobool  # pylint: disable=no-name-in-module,import-error
+from distutils.util import strtobool  # pylint: disable=no-name-in-module,import-error,deprecated-module


Crazy work 😭

I honestly dont remember why I did this 😭 Im pretty sure I had an actual reason, though

looks like the cursedness of whatever evals csv import stuff is going on

costowell · 2025-10-21T16:37:32Z

Is #419 the only thing blocking this?

move status for gatekeep response to route + fix 500 if user does not exist

BigSpaceships

LGTM now (we do need to fix the merge conflict?)

Fix merge conflict

mroley1 and others added 30 commits April 14, 2024 14:31

has been annoying me for a while

54a9514

Added line to major project form

76f193c

Added rows to the form so I'm testing it

a20bfe3

More parts of form

7aae71e

Make text larger hopefully

fbfbbb9

changed font size

eb8531f

push styles

7a6d743

fixed build issue

342578d

run npm install

3ded9cf

Added dropzone (but it isnt functioning yet)

bbd97e9

edited upload form

d0b566a

edited photo

d736f2f

form stylistically done

5a1bac7

dropzone should work

d14312f

Dropzone.js

fbfc959

dropzone doesn't like me

9adfbd8

conditional/templates/major_project_submission.html

adf5e5d

I don't know what commands do what

1aefd4c

S3 support added

d5f968b

debug

73d0449

ImmutableMultiDict is not a dict. changed accordingly?

7a69ff7

You need to wrap keys in a list to read its length

921b8b4

You need to wrap keys in a list to read its length

c0b9c48

debug 2

d6daa64

more debug

29e1fcd

should be able to obtain files now

fc12aa2

whoever designed this confuses me immensely

2f42078

s3 endpoint added

b9a2f33

os file debug

b73a8b9

99% sure it will upload to the bucket now

b78f86a

costowell and others added 17 commits September 9, 2025 21:56

Merge pull request #402 from Qelxiros/packet-glue

0fc55d5

glue

migration, url fixes (#403)

736d203

packet glue (#404)

ee6fc41

* migration, url fixes * chom

chom (#405)

a904044

chom (#406)

8a6b501

packet glue (#407)

2b4bc44

* chom * chom

gatekeep

25d43f2

voting status on dashboard

b9cb4fc

adding more return information for vote to use

e7617e8

Merge pull request #389 from mroley1/develop

70110fb

add css animation to dropdown arrows

fix readability in dashboard

5dc992c

account for semesters

2e140fe

remove frosh from voting lists if they don't have requirements after …

af307ee

…6 weeks

Revert @tallen42's work on the major project form (#410)

b8fd20c

Merge pull request #408 from shaeespring/feature/vote_role

8342957

gatekeep

Fix errors missed in #408 (#411)

17b0773

* move gatekeep_status to members.py * Fix errors in gatekeep_status * Fix unused import, fix logic error * Remove duplicate imports * Remove non-existent options from lint

BigSpaceships reviewed Oct 21, 2025

View reviewed changes

BigSpaceships requested changes Oct 21, 2025

View reviewed changes

conditional/__init__.py Outdated

Comment on lines 170 to 171

Copy link

Contributor

BigSpaceships Oct 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we probably should get rid of the whitespace

goosenotduck reviewed Oct 21, 2025

View reviewed changes

BigSpaceships added 2 commits October 21, 2025 12:11

move status for gatekeep response to route

e636482

fix me being dumb :)

888b082

BigSpaceships added 2 commits October 21, 2025 13:15

fix 500 error when requesting gatekeep for a user that doesn't exist

b48db4f

Merge pull request #419 from ComputerScienceHouse/refactor-for-418

46ea5d2

move status for gatekeep response to route + fix 500 if user does not exist

BigSpaceships approved these changes Oct 21, 2025

View reviewed changes

pikachu0542 and others added 2 commits October 21, 2025 14:44

Fixed merge conflict

81660ee

Merge pull request #420 from ComputerScienceHouse/fix-merge-conflict

66bceec

Fix merge conflict

pikachu0542 merged commit bc8b71c into master Oct 21, 2025
8 checks passed

cecilialau6776 mentioned this pull request Oct 21, 2025

Revert "Merge dev into main" #421

Merged

Merge dev into main #418

Merge dev into main #418

Uh oh!

Conversation

pikachu0542 commented Oct 21, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BigSpaceships left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

goosenotduck left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

costowell commented Oct 21, 2025

Uh oh!

BigSpaceships left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants