Skip to content

Release 3.1.3 Build 46 #102

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

Merged
merged 25 commits into from
Oct 12, 2025
Merged

Release 3.1.3 Build 46 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b1c36a1
Addressed Matt's comments
caitlynjin Oct 28, 2024
ff4d1c5
Merge Release to Main (#69)
rs929 Nov 4, 2024
99b59eb
Fixed spacing of tabbar and transition
caitlynjin Nov 7, 2024
a6db494
Fix spacing of tab bar
caitlynjin Nov 11, 2024
8afeb46
Update class detail page navigation
caitlynjin Nov 11, 2024
efae66a
Fix spelling error
caitlynjin Nov 12, 2024
86a09cc
Implement onboarding flow (#75)
belle-hu Dec 3, 2024
d9fb12f
Merge branch 'release'
JaysonHahn Feb 5, 2025
a3f8a75
Implemented Capacity Reminders UI (#65)
caitlynjin Mar 7, 2025
847fc47
ten intervals (#81)
JiwonJeong414 Mar 21, 2025
8c989b0
Implemented Popular Times (#79)
rs929 Mar 25, 2025
2bd0fc7
Caitlyn/gym details layout (#82)
rs929 Mar 25, 2025
a285525
Jiwon/profile (#80)
JiwonJeong414 Mar 26, 2025
c84c7ef
Changed Debug to Release (#87)
JiwonJeong414 Mar 26, 2025
c6b690b
Merge Release 3.1.1 to Main (#89)
rs929 Mar 27, 2025
25dd3da
Set up Firebase Cloud Messaging (#90)
caitlynjin Apr 23, 2025
088f0a3
Fixed Teagle capacities bug on gym detail view (#93)
caitlynjin Sep 16, 2025
16f0813
Jiwon/capacity reminders (#96)
JiwonJeong414 Oct 3, 2025
42e7659
Update ci_post_clone script to use GRAPHQL_SCHEMA
MrPeterss Oct 5, 2025
88a7ae3
Fix Merge Conflicts and Merge Release 3.1.2 to Main (#97)
MrPeterss Oct 5, 2025
0d0337e
Jiwon/capacity reminder tutorial (#99)
JiwonJeong414 Oct 8, 2025
87235f8
Remove SwiftUICore import
MrPeterss Oct 8, 2025
ac1927e
Merge branch 'release' into main-copy
MrPeterss Oct 12, 2025
e1ed297
small fix
MrPeterss Oct 12, 2025
fff9e46
Merge pull request #104 from cuappdev/main-copy
MrPeterss Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions Uplift.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Uplift/Models/Equipment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import Foundation
import UpliftAPI
import SwiftUICore
import SwiftUI

/// Model representing a facility's equipment.
struct Equipment: Hashable {
Expand Down
4 changes: 2 additions & 2 deletions Uplift/Views/HomeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ struct HomeView: View {
private var capacityReminder: some View {
NavigationLink {
CapacityRemindersView()
} label: {
} label: {
HStack {
Text("CAPACITY REMINDERS")
.font(Constants.Fonts.bodyMedium)
Expand All @@ -110,7 +110,7 @@ struct HomeView: View {
.shadow(color: Color.black.opacity(0.1), radius: 4, x: 0, y: 2)
)
}
.buttonStyle(ScaleButtonStyle())
.buttonStyle(ScaleButtonStyle())
}

private func capacityCircle(facility: Facility?) -> some View {
Expand Down