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

ID4 Release to Master #233

Merged
merged 201 commits into from
Mar 18, 2024
Merged

ID4 Release to Master #233

merged 201 commits into from
Mar 18, 2024

Conversation

ralphgregorio
Copy link
Collaborator

No description provided.

glenntanjoh and others added 30 commits February 25, 2024 22:55
@glenntanjoh
Added functionality for Login Page
104d7f9
@glenntanjoh
Merged dev into login branch
0577dd3
@glenntanjoh
Added more styles for the login and sign up pages
9f3d225
@glenntanjoh
refactored styling on css and enforced css modules
bede1e7
@cameronbeattie306
added download hook files
2cf4e63
@ralphgregorio
Modify pipeline for testing (Revert later)
2d2c2e2
@ralphgregorio
Added server xml and changed port to 8080
d837aa7
@ralphgregorio
Heavily sped up docker builds
3f95471
@ralphgregorio
Change port back to 80
f8ad5b3
@ralphgregorio
Listen to port 80 instead
9cc2c4a
@ralphgregorio
Configure server.xml
ab8e81b
@ralphgregorio
Fix port redirection
27db99b
@ralphgregorio
Revert port changes
1cba621
@ralphgregorio
Fix ports
0cf4080
@ralphgregorio
mount encrypt keys
9a225f6
@ralphgregorio
Make base api use https and fix pre commit hook
c0223c1
@ralphgregorio
Fix pre commit hook
ef271da
@ralphgregorio
Revert "Modify pipeline for testing (Revert later)"
7ed45b5 
This reverts commit 2d2c2e2.
@ralphgregorio
Merge pull request #188 from UniversityOfSaskatchewanCMPT371/build/15…
fd81c96 
…3-setup-tls

Setup TLS
@ralphgregorio
delete requirements file
ef44cc2
@ralphgregorio
Initial test files for HomeController
081ea43
@ralphgregorio
Fix dependencies
4fa87db
@ralphgregorio
Refactor test
9fe1c02
@ralphgregorio
Fix package routing
943d950
@ralphgregorio
Document how to use testing
9b3f51e
@ralphgregorio
Setup pipeline
efacee2
@ralphgregorio
small pipeline modification
69092a0
@ralphgregorio
Include backend in workflows to finish for deployment
e2f8e17
@ralphgregorio
Readme clarification update
54062ae
@ralphgregorio
rename pipeline job
d91435c
cameronbeattie306 and others added 10 commits March 15, 2024 21:13
@cameronbeattie306
Merge branch 'release/id4' of https://github.com/UniversityOfSaskatch…
ab7feb7 
…ewanCMPT371/term-project-2024-team-3 into 228/Assertions-Docstrings-PredictedDataPage
@cameronbeattie306
Merge pull request #229 from UniversityOfSaskatchewanCMPT371/228/Asse…
6af5a57 
…rtions-Docstrings-PredictedDataPage

renamed usePredictedFile hook to usePredictFile
@redwing14e
added comments, assertions, and logging
03d30f2
@redwing14e
fixed linter problems
806b749
@redwing14e
added error handeling on upload
8e1503e
@redwing14e
Merge pull request #238 from UniversityOfSaskatchewanCMPT371/QA/227-U…
ab30400 
…pload-Page-QA

added comments, assertions, and logging
@cameronbeattie306
tests finished and added to matrix
38ca189
@cameronbeattie306
Merge branch 'release/id4' of https://github.com/UniversityOfSaskatch…
120ce34 
…ewanCMPT371/term-project-2024-team-3 into 204/Login-Service-Class-Testing
@Juanan-design
Merge branch 'release/id4' of https://github.com/UniversityOfSaskatch…
5ab78a9 
…ewanCMPT371/term-project-2024-team-3 into QA/187-UpdateTestPlan
@cameronbeattie306
Merge pull request #237 from UniversityOfSaskatchewanCMPT371/204/Logi…
4aeed03 
…n-Service-Class-Testing
@ralphgregorio ralphgregorio marked this pull request as ready for review March 16, 2024 17:23
Juanan-design and others added 10 commits March 16, 2024 11:35
@Juanan-design
Merge branch 'release/id4' of https://github.com/UniversityOfSaskatch…
5eca066 
…ewanCMPT371/term-project-2024-team-3 into QA/187-UpdateTestPlan
@Juanan-design
added ids to some tests
fa1dc24
@Juanan-design
yet added more ids
aa6859c
@Juanan-design
Merge pull request #240 from UniversityOfSaskatchewanCMPT371/QA/187-U…
b09cc16 
…pdateTestPlan

Qa/187 update test plan
@redwing14e
fixed issue where logout attempts from playwright were failing on chr…
3279458 
…omium and webkit and added more granular navbar tests
@redwing14e
Merge branch 'release/id4' of https://github.com/UniversityOfSaskatch…
7177567 
…ewanCMPT371/term-project-2024-team-3 into QA/239-Playwright-improvements
@redwing14e
fixed processed data page playwright tests
4aa8e32
@redwing14e
fixed the test for logout api need due to my changes
078f108
@redwing14e
fixed my last fix
6399997
@redwing14e
Merge pull request #241 from UniversityOfSaskatchewanCMPT371/QA/239-P…
af46847 
…laywright-improvements

Qa/239 playwright improvements
ArdalanAskarian
ArdalanAskarian approved these changes Mar 17, 2024
View reviewed changes
Copy link
Collaborator

@ArdalanAskarian ArdalanAskarian left a comment

Choose a reason for hiding this comment

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

Everything is great! Just needs to add documentation.

Juanan-design
Juanan-design approved these changes Mar 17, 2024
View reviewed changes
Copy link
Collaborator

@Juanan-design Juanan-design 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. Ready to merge

@mpk467
Copy link
Collaborator

mpk467 commented Mar 17, 2024

LGTM!

redwing14e
redwing14e approved these changes Mar 17, 2024
View reviewed changes
Copy link
Collaborator

@redwing14e redwing14e left a comment

Choose a reason for hiding this comment

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

Still needs the documents added but otherwise looks good.

@ralphgregorio ralphgregorio merged commit 2a97348 into master Mar 18, 2024
2 of 3 checks passed
@ralphgregorio ralphgregorio deleted the release/id4 branch March 18, 2024 00:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mpk467 mpk467 mpk467 approved these changes

@ArdalanAskarian ArdalanAskarian ArdalanAskarian approved these changes

@Juanan-design Juanan-design Juanan-design approved these changes

@redwing14e redwing14e redwing14e 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.
8 participants
@ralphgregorio @mpk467 @redwing14e @Juanan-design @ArdalanAskarian @glenntanjoh @cameronbeattie306 @kamalzrein