Skip to content
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

Jump to bottom

I forgot to do git pull #153

Merged
merged 33 commits into from
Apr 9, 2024
Merged

I forgot to do git pull #153

merged 33 commits into from
Apr 9, 2024

Conversation

FegelSamuel
Copy link
Collaborator

lol

FegelSamuel and others added 30 commits February 8, 2024 15:23
@FegelSamuel
Basic Prisma Change; Needs follow up
675383c
@FegelSamuel
Merge pull request #130 from UTDallasEPICS/stage
0be3ba8 
git pull but without a terminal lol
@FegelSamuel
EditPageID converted
592f3a9
@FegelSamuel
SQL migrated
f5898e7
@FegelSamuel
schema and prisma changes
94519e2
@FegelSamuel
Looks okay to me, unsure of what else to fix. Need to ask Ofek about …
9c07cfd 
…one more thing though
@FegelSamuel
corrected from Ofek
403e90d
@FegelSamuel
initial schema and types change
3db86c8
@FegelSamuel
first_name
58acf75
@FegelSamuel
more commits
280a170
@FegelSamuel
page fix
f0a0ff2
@FegelSamuel
Merge branch 'stage' into samPrismaFix
7242bc3
Merge branch 'kushikaTest' into samPrismaFix
75a7b3e
@FegelSamuel
Basic Prisma Change; Needs follow up
881902e
@FegelSamuel
EditPageID converted
65b64f3
@FegelSamuel
SQL migrated
0325d0e
@FegelSamuel
schema and prisma changes
c5e3fe9
@FegelSamuel
Looks okay to me, unsure of what else to fix. Need to ask Ofek about …
9f52151 
…one more thing though
@FegelSamuel
corrected from Ofek
50fe7f1
@FegelSamuel
initial schema and types change
980d329
@FegelSamuel
first_name
a6a2e03
@FegelSamuel
page fix
3353857
@FegelSamuel
Merge branch 'samPrismaFix' of https://github.com/UTDallasEPICS/Carso…
1e5c3b5 
…n-s-Village into SamPrismaFix
@FegelSamuel
tazfix
93a4430
@FegelSamuel
[HOTFIX] HTML Problem
617b7bf
@FegelSamuel
Merge branch 'stage' of https://github.com/UTDallasEPICS/Carson-s-Vil…
592bea4 
…lage into SamPrismaFix
@FegelSamuel
Merge branch 'stage' into samPrismaFix
2511633
@FegelSamuel
Merge branch 'stage' into samPrismaFix
e057132
@OfekShaltiel-UTD
Fixed comment clearing bug on stage, and fixed backend issues with
9b98499
@FegelSamuel
Merge pull request #152 from UTDallasEPICS/samPrismaFixRollback
977a525 
Sam prisma fix rollback
OfekShaltiel-UTD and others added 3 commits April 9, 2024 11:58
@OfekShaltiel-UTD
Merge branch 'stage' into aprilRefFixes
99fe462
@OfekShaltiel-UTD
Merge pull request #151 from UTDallasEPICS/aprilRefFixes
010869c 
AprilRefFixes
@FegelSamuel
[HOTFIX] 4/9/2024
9afbed9 
Samuel somehow borked the API without ever touching it. We love WebDev
@FegelSamuel FegelSamuel requested a review from pariahGH as a code owner April 9, 2024 17:29
@FegelSamuel FegelSamuel merged commit 776e3d4 into rafidSamCommentModeration Apr 9, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pariahGH pariahGH Awaiting requested review from pariahGH

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FegelSamuel @OfekShaltiel-UTD