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.

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

Committing 2023 Code to Master #530

Merged
merged 42 commits into from
Jul 18, 2023
Merged

Committing 2023 Code to Master #530

merged 42 commits into from
Jul 18, 2023

Conversation

lasyaneti
Copy link
Contributor

ios hackillinois 2023 end of an era

ashayp22 and others added 30 commits June 27, 2022 21:40
Bumping deployment target - Louis/swiftUI deprecations
Onboarding page migration complete.
Google Maps setup complete.
Fixed deprecations
Registered Montserrat text to Info.plist and updated text attributes
Updated refresh animation json file.
Updated leaderboard cells, including fixing the flow controller add-on
* feat: Lottie file with text
* chore: add files via commit
Removed logout button from view and changed the error message color to white.
…ile ticket when food diet not fit in category (#516)
louisunlimited and others added 12 commits February 14, 2023 22:44
Fixed issue where the bottom of certain letters such as 'y' get cut off.
* Add everything in Final Doc

White X on QR
Fix Dietary layout
Alert now has name and dietary
Profile Reloads on QR scan and loading view
Name truncates

* Add deinit

* Fix random alert not having data
* removed text

* fix: memories made text
* fix: event detail card locations

* fix: event bubble cell locations
@lasyaneti lasyaneti changed the title Merge dev to master Committing 2023 Code to Master Jul 17, 2023
@lasyaneti lasyaneti marked this pull request as ready for review July 17, 2023 04:51
Copy link
Contributor

@ashayp22 ashayp22 left a comment

Choose a reason for hiding this comment

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

Looks good to me. While we have merged all commits into master in the past, commit hisotyr is preserved in dev so it makes sense to me to squash all commits and merge one commit titled "2023 app" or "<enter iOS app version" or something along the lines of that.

I'm also noticing that we forgot to add Bump commits like in the past. That's ok, but it's good practice to do this for 2024.

@lasyaneti lasyaneti merged commit 849da8b into master Jul 18, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants