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

Development #40

Merged
merged 100 commits into from
Mar 13, 2024
Merged

Development #40

merged 100 commits into from
Mar 13, 2024

Conversation

DanielEap
Copy link
Contributor

No description provided.

SlowMiata and others added 30 commits February 19, 2024 21:02
@SlowMiata
created file for workout page
8f8deb0
@SlowMiata
created file for workout page
7e36abb
@SlowMiata
added title and weight input to workout page
9947f2e
@SlowMiata
added progress for form and velocity
311b5ea
@SlowMiata
added viewModel into startWorkout
9d76caf
@SlowMiata
added temp start and finish functions to mic
6d4f207
@SlowMiata
rename view files for clarity
04c4cb0
@parchea
Pet page
c8b42b8
@parchea
add comment for API doc
4aab7df
@parchea
Merge pull request #22 from Capstone-Projects-2024-Spring/SW-95-creat…
0cbbe8d 
…e-pet-page

Sw 95 create pet page
@parchea
minor fix for th api doc
1404427
@jtstanczak7
Added images, minor display changes
e7d5cdd
@parchea
Merge pull request #23 from Capstone-Projects-2024-Spring/SW-23-pet-s…
362a0c4 
…hop-format

Added images, minor display changes by Jonathan
@parchea
minor change of comment on code
a9223ba
@parchea
Merge remote-tracking branch 'refs/remotes/origin/development'
baf3f53
Added entities for machine learning local coredata
be62850
Added comments for both API and local developers in Persistence.swift…
1e0f7ba 
…, as well as add more entities to CoreData
@SlowMiata
added api comments into views
9fdbce0
modified one of the comments to show through api doc
0d30933
@SlowMiata
added parameter comments to 'add progress'
c0c9392
@SlowMiata
Merge branch 'development' into SW-96-workout-page-format
cf8b22a
@SlowMiata
Merge pull request #25 from Capstone-Projects-2024-Spring/SW-96-worko…
d53338a 
…ut-page-format

Sw 96 workout page format
@SlowMiata
Revert "Sw 96 workout page format"
f73de17
@SlowMiata
Merge pull request #26 from Capstone-Projects-2024-Spring/revert-25-S…
3c4bbc9 
…W-96-workout-page-format

Revert "Sw 96 workout page format"
@parchea
Merge remote-tracking branch 'refs/remotes/origin/development'
462ff32
@parchea
Commit (navbar, navbarcontroller, and homepage) all the work is by di…
34a41a7 
…llon.
@parchea
remove the nav bar file
c157741
@parchea
Navbar, NavController, and Homepage - All work is by Dillion
5eb5077
@parchea
workout button implementation
0838d87
@SlowMiata
rename files and added files for workout page
09e4af4
DanielEap and others added 28 commits February 29, 2024 12:03
@DanielEap
Update ios.yml
70a8b2b
@DanielEap
Update ios.yml
8351598
@DanielEap
Update ios.yml
78bff26
@DanielEap
Update ios.yml
75990e2
@DanielEap
Delete .github/workflows/ios.yml
a3bc7d0 
temporary just until end of sprint
@SlowMiata
created a file for testing workoutUI
c868ee0
@jtstanczak7
refactored pet store code and added sorting (name/price) tests into t…
ade3423 
…ests file.
@parchea
Merge pull request #44 from Capstone-Projects-2024-Spring/SW-76-Selec…
7deebdc 
…tVirtualPet

Sw 76 select virtual pet
@SlowMiata
UITests WILL FAIL, since navigation not complete
e0f22a4
@SlowMiata
Merge branch 'restyle-workout-progress' into development
184eb36
@SlowMiata
deleted ios.yml
09a854a
@SlowMiata
update README.md
4761742
@dillon09776
Navbar UI tests
5c8b0d2
@AdamRa97
Sign in with Apple button works on Simulator, still need to add more …
8b7fa99 
…for full functionality for app usage
@AdamRa97
Added support for night mode for the Sign in with Apple button
0601976
@SlowMiata
Merge pull request #45 from Capstone-Projects-2024-Spring/SW-10-accou…
75dd356 
…nt-verification

Sw 10 account verification
@parchea
readjust the navbar
6eb056d
@DanielEap
Create ios-cd.yml
4d0e1e1
@DanielEap
fastfiles
ba1a2b1
@DanielEap
Merge branch 'development' of https://github.com/Capstone-Projects-20…
712fa45 
…24-Spring/project-smartweights into development
@DanielEap
Update ios-cd.yml
6dfe845
@DanielEap
Update ios-cd.yml
e9a6c22
@DanielEap
Update ios-cd.yml
e2511ac
@DanielEap
Update ios-cd.yml
0df5dd3
@DanielEap
Update ios-cd.yml
baba30c
@DanielEap
update plist entitlements for archive
9ad0bad
@DanielEap
plist and entitlements for archive
f7b7718
@DanielEap
Merge branch 'development' of https://github.com/Capstone-Projects-20…
5eb3a7e 
…24-Spring/project-smartweights into development
SlowMiata
SlowMiata approved these changes Mar 13, 2024
View reviewed changes
Copy link
Contributor

@SlowMiata SlowMiata 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, added the pages that are needed

@DanielEap DanielEap merged commit 2a4a3d6 into main Mar 13, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SlowMiata SlowMiata SlowMiata 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.
6 participants
@DanielEap @SlowMiata @parchea @jtstanczak7 @dillon09776 @AdamRa97