Skip to content

merge develop to main for CICD and assignment 2 #123

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
Closed
MasahisaSekita wants to merge 76 commits into from
Closed

merge develop to main for CICD and assignment 2 #123

MasahisaSekita wants to merge 76 commits into from

Conversation

@MasahisaSekita
Copy link
Contributor

@MasahisaSekita MasahisaSekita commented Mar 27, 2025 •
edited
Loading

Description

SCRUM-163

Pushing changes to develop to main to launch CICD workflow working on main.

Type of change

  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist:

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings

kevin-lann and others added 30 commits January 28, 2025 13:50
@kevin-lann @thomasyzy7 @Austin-X
Add ux ui mockups link (#4)
211d03b 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
@minhhaitran08
Add Product.md file (#5) - Scrum 19
c880b5d
@Austin-X
Finish all sections of README.md apart from the Installation section (#6
68ba14f 
)
@thomasyzy7 @Austin-X
Ty/scrum 63 added product_backlog.md (#11)
40cb488 
Co-authored-by: Austin-X <[email protected]>
@kevin-lann @Austin-X
Kl/scrum 21 installation (#10)
61030d1 
Co-authored-by: FLAME <[email protected]>
@kevin-lann @thomasyzy7 @Austin-X
Kl/scrum 20 project setup (#12)
18ac6de 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
@MasahisaSekita @thomasyzy7 @Austin-X
Ms/scrum 23 added personas (#9)
9230bbf 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
@kevin-lann
Fix: README .env typo (#13)
eaf04ba
@thomasyzy7 @minhhaitran08
@Austin-X @kevin-lann
Release/0.1 - Develop (#15)
ab8a7e1 
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
@Austin-X @thomasyzy7
@minhhaitran08 @kevin-lann @MasahisaSekita
[Hotfix]: Add missing section in README.md for "Tech Stack and Softwa…
ccf59f9 
…re Architecture Pattern" - Develop (#17)

Co-authored-by: dawangk <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
@kevin-lann
Kl/scrum 69 extract info (#18)
e27c8ee
@kevin-lann
Setup redux store and api slice (#19)
a90b064
@kevin-lann
Kl/scrum 71 course list frontend (#21)
e59147e
@Austin-X
Set up /api/courses and /api/departments endpoints in backend (#22)
5d9786d
@MasahisaSekita
Ms/scrum 26 login and signup (#25)
ac83923
@kevin-lann
Integrate Course List and Entries display (#23)
e0338e7
@thomasyzy7 @kevin-lann @Austin-X
Ty/scrum 80 user auth backend (#26)
b94deb2 
Co-authored-by: Kevin Lan <[email protected]>
Co-authored-by: Austin-X <[email protected]>
@Austin-X @kevin-lann
Add User Menu Dropdown Component (#27)
16c3993 
Co-authored-by: Kevin Lan <[email protected]>
@kevin-lann @thomasyzy7
Integrate Login and Signup (#28)
a2d17a2 
Co-authored-by: dawangk <[email protected]>
@Austin-X
Account Logout Functionality (#29)
bf85a8f
@minhhaitran08 @thomasyzy7
@Austin-X @kevin-lann
SCRUM70 - Mt/scrum 70 sprint1 documentation (#20)
66229ba 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
@thomasyzy7 @Austin-X
@minhhaitran08 @kevin-lann @MasahisaSekita
Release/1.0 - Develop (#31)
d859df0 
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
@Austin-X
[SCRUM-107]: Set up Github Workflow to auto-format unformatted code u…
0c61165 
…sing Prettier (#34)

Co-authored-by: Austin-X <[email protected]>
@thomasyzy7
Ty/scrum 95 Reset Password Backend (#32)
0209f3e 
Co-authored-by: dawangk <[email protected]>
@kevin-lann
Kl/scrum 110 document frontend (#35)
0dc08b2 
Co-authored-by: kevin-lann <[email protected]>
@Austin-X
Ax/scrum 111 document backend (#36)
3e47072 
Co-authored-by: Austin-X <[email protected]>
@kevin-lann
Kl/scrum 112 Bugfix add password max length validation (#40)
6c36d1c
@kevin-lann
Kl/scrum 113 Set user session after login to handle RLS & Modify back…
76339d3 
…end queries (#42)

Co-authored-by: kevin-lann <[email protected]>
@kevin-lann
Kl/scrum 114 fix redirect login (#41)
64f971a 
Co-authored-by: kevin-lann <[email protected]>
@kevin-lann
Kl/scrum 117 fix auth middleware (#44)
b67705d 
Co-authored-by: kevin-lann <[email protected]>
minhhaitran08 and others added 29 commits March 18, 2025 17:26
@minhhaitran08
Mt/scrum 58 child 60 sharing timetable backend (#73)
e71811e
@thomasyzy7
Ty/scrum 52 timetable generation (#74)
e34ce55 
Co-authored-by: dawangk <[email protected]>
@kevin-lann
Hotfix 1.0.3 - Revert "Ty/scrum 52 timetable generation (#74)" (#80)
8bba298
@thomasyzy7
Ty/scrum 52 timetable generation (#81)
c12fbd0 
Co-authored-by: dawangk <[email protected]>
@kevin-lann @thomasyzy7
Kl/scrum 56 email notifications (#78)
ad6c9c3 
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: dawangk <[email protected]>
@MasahisaSekita @minhhaitran08
Ms/scrum 127 update sprint 3 documentation (#72)
f8adc57 
Co-authored-by: MasahisaSekita <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
@Austin-X
Ax/scrum 122 Timetable Basics Integration (#69)
e93d766 
Co-authored-by: Austin-X <[email protected]>
@Austin-X
Ax/scrum 144 Add integration tests (#83)
9c358fc 
Co-authored-by: Austin-X <[email protected]>
@kevin-lann @thomasyzy7
Kl/scrum 41 ai timetable generate (#75)
fbb2a44 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: dawangk <[email protected]>
@kevin-lann
Kl/scrum 55 timetable generation integration (#85)
4bb785f 
Co-authored-by: kevin-lann <[email protected]>
@minhhaitran08
Mt/scrum 138 child 139 backend testing timetablesController, restrict…
202c807 
…ionsController (#84)
@thomasyzy7
Ty/scrum 128 sprint restrospective (#89)
32ef75d 
Co-authored-by: dawangk <[email protected]>
@kevin-lann @thomasyzy7
@Austin-X @minhhaitran08 @MasahisaSekita @prokopchukdim
Release/1.3 [develop] (#92)
5570acf 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: Dmitriy Prokopchuk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>
@kevin-lann @thomasyzy7
@Austin-X @minhhaitran08 @MasahisaSekita @prokopchukdim
Hotfix 1.0.4 [develop] (#93)
e3ebef5 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: minhhaitran08 <[email protected]>
Co-authored-by: Masahisa Sekita <[email protected]>
Co-authored-by: Dmitriy Prokopchuk <[email protected]>
Co-authored-by: Austin-X <[email protected]>
Co-authored-by: dawangk <[email protected]>
Co-authored-by: kevin-lann <[email protected]>
Co-authored-by: MasahisaSekita <[email protected]>
Co-authored-by: dawangk <[email protected]>
@MasahisaSekita
Ms/scrum 130 project deployment CI/CD (#79)
234c1a4 
Here we integrate the CI/CD pipeline for our application and all assignment 2 documentation.
@kevin-lann
Kl/scrum 154 fix time strings (#101)
13cc5f8 
Co-authored-by: kevin-lann <[email protected]>
@Austin-X
Ax/scrum 146 fix same-name-timetable frontend bug (#100)
33ee4a7 
Co-authored-by: Austin-X <[email protected]>
@thomasyzy7 @kevin-lann
Ty/scrum 153 timetable generation bug (#104)
bebf8c0 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Kevin Lan <[email protected]>
@MasahisaSekita
Ms/scrum 130 project deployment with latest documentation (#105)
d00d315
@kevin-lann
Kl/scrum 148 chatbot fixes (#102)
96655f1 
Co-authored-by: kevin-lann <[email protected]>
@thomasyzy7
Ty/scrum 57 timetable favourite (#106)
440f93a 
Co-authored-by: dawangk <[email protected]>
@thomasyzy7
Ty/scrum 155 generator refinement (#107)
5f2e0bb 
Co-authored-by: dawangk <[email protected]>
@kevin-lann
Kl/scrum 147 fix timetable integration bugs (#103)
198f5f2 
Co-authored-by: kevin-lann <[email protected]>
@thomasyzy7 @kevin-lann
Ty/scrum 156 + 157 (#112)
a166876 
Co-authored-by: dawangk <[email protected]>
Co-authored-by: Kevin Lan <[email protected]>
@kevin-lann
Kl/scrum 62 timetable compare (#108)
9ad7166 
Co-authored-by: kevin-lann <[email protected]>
@kevin-lann
Kl/scrum 158 ai hallucinating (#115)
69db0ce 
Co-authored-by: kevin-lann <[email protected]>
@MasahisaSekita
CI/CD Pipeline with assignment 2 documentation (#120)
5d7e766
@thomasyzy7
Ty/scrum 161 favourite bug (#119)
7550a07
@Austin-X
Ax/scrum 60 Timetable Sharing Feature (#117)
265aba0 
Co-authored-by: Austin-X <[email protected]>
@thomasyzy7 thomasyzy7 closed this Mar 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

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

@MasahisaSekita @thomasyzy7 @kevin-lann @minhhaitran08 @Austin-X