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

Staging to Main #111

Merged
merged 73 commits into from
Oct 18, 2024
Merged

Staging to Main #111

merged 73 commits into from
Oct 18, 2024

Conversation

sinhaaaryan
Copy link
Collaborator

No description provided.

matherg and others added 30 commits September 17, 2024 12:12
@matherg
New Models
8140a47
@matherg
bucket policy
548697e
@matherg
Profile flow works
8b9f387
@matherg
updates
f448ec2
@matherg
Temp changes
74677fb
@matherg
wip
e86b08c
@matherg
Pause progress
b188cf7
@matherg
Working pfp
15bf84d
@matherg
touchups
8c7d6e0
@matherg
Merge pull request #105 from sandboxnu/conversationmodel
1906e80 
Conversationmodel
@matherg
Add missing dependencies
6b78497
@matherg
Graceful error handling
7edf5a9
@matherg
Remove test input
8cb4a6f
@matherg
Header placement adjustment
ed83e87
@matherg
modal handle close
d0035b0
@matherg
Minor button styling
e481822
@sinhaaaryan
Merge pull request #106 from sandboxnu/profile
9dcab44 
Profile Picture
@matherg
current state
e915296
@matherg
msgs
b3886a4
@matherg
current
d96cc9d
@matherg
current
3b6358d
@matherg
mapSwitching
6639914
@matherg
Map passthrough
ad29d4b
@matherg
All main functionality working
0373de2
@matherg
All but pfp and unread msgs
2e64bf7
@matherg
Unread messages number
dd9cedd
@matherg
pfp, message scaling
8e7f2f3
@matherg
dynamic name sizing
d8b6cfb
@matherg
Messaging
7344285
@matherg
type fixes
f388735
matherg and others added 26 commits October 16, 2024 10:37
@matherg
missed files
755f52f
@matherg
Merge pull request #108 from sandboxnu/bugsandates
5efef08 
Bugs + Start/End dates
@sinhaaaryan
Merge pull request #109 from sandboxnu/SCRUM-80
35c22c3 
SCRUM-80 rebase
@matherg
Mark messages as read fix
c839269
@matherg
Relaxed cutoffs for recommendations
93bf53a
@matherg
header updates dynamically with read messages
081a45e
@sinhaaaryan
Fixed request template bug
2ec319b
@matherg
Co-op start and end date on cards
035a88a
@sinhaaaryan
Email (@gmail.com) staging fix - only checks for @gmail.com emails in…
a7fac91 
… staging
@matherg
fixed failing test
115e012
@matherg
Connect modal text change
f15950b
@matherg
ConnectModal message update
8508d7a
@sinhaaaryan
Updates to template + template script
f54d8ee
@sinhaaaryan
Minor fix for gmail.com email error code in staging
a8c9d48
@sinhaaaryan
Merge branch 'staging' of https://github.com/sandboxnu/nucarpool into…
ff5c3f3 
… staging
@sinhaaaryan
Emailing when sending request works
9ccfc96
@sinhaaaryan
Email logic for accepting request and sending message added and worki…
ee2fcd1 
…ng + other small fixes
@sinhaaaryan
Added bold text to template and changed name to preferredName for emails
3fdf302
@sinhaaaryan
Merge branch 'staging' into emailcode
53dab7c
@sinhaaaryan
one more minor fix for preferred name
611097c
@sinhaaaryan
Merge branch 'emailcode' of https://github.com/sandboxnu/nucarpool in…
5a9f853 
…to emailcode
@matherg
Merge pull request #110 from sandboxnu/emailcode
ecd2bdb 
SCRUM-80: Email notifications for requests and messages
@matherg
withdraw request fix
9805050
@sinhaaaryan
Template script fixes to carpool URL
7c19c68
@matherg
Backend google fix
71adf2e
@sinhaaaryan
Merge branch 'staging' of https://github.com/sandboxnu/nucarpool into…
5e8194a 
… staging
@vercel Vercel
Copy link

vercel bot commented Oct 18, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
nucarpool-46y7 ❌ Failed (Inspect) Oct 18, 2024 6:11pm

@github-actions GitHub Actions
Copy link

👋 @sinhaaaryan
Looks like your PR might contain changes to the schema.prisma file. Please open a deploy request on PlanetScale before merging. If you have any questions, ping @lukejianu on Slack.

matherg
matherg approved these changes Oct 18, 2024
View reviewed changes
Copy link
Collaborator

@matherg matherg left a comment

Choose a reason for hiding this comment

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

All looks good + tested in staging

@matherg matherg merged commit d5a4164 into main Oct 18, 2024
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matherg matherg matherg approved these changes

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
@sinhaaaryan @matherg