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

[Chore] Merge development into main #433

Merged
merged 143 commits into from
Aug 7, 2024
Merged

[Chore] Merge development into main #433

merged 143 commits into from
Aug 7, 2024

Conversation

d3li0n
Copy link
Contributor

@d3li0n d3li0n commented Aug 5, 2024

Description

Mergin development into master

Type of change

  • Bug fix
  • New feature
  • Documentation update
  • Other: merge development into master

How Has This Been Tested?

N/A

Checklist:

N/A

fperellaholfeld and others added 30 commits May 22, 2024 17:27
@fperellaholfeld @d3li0n
Update to husky setup to localize it within our nextjs app directory (#…
feed16c 
…10)

Co-authored-by: Dima Zhuravel <dmitrozhyravel@gmail.com>
@fperellaholfeld
deleted redundant files that didn't work with PR
30e81b0
@d3li0n
Docker postgres setup (#13)
f1b8684
@d3li0n
[Task] Setup backend using NestJS framework (#27)
bca1bc9
@d3li0n
[Feature] Setup Github Actions to run CI pipeline (#16)
d0c1764
@d3li0n
[Feature] Run all of our services in docker container (#34)
cacc6f3
@fperellaholfeld
Feature/omr processing backend - module creation (#31)
db59abb
@fperellaholfeld
Feature/frontend user routes (#55)
ba6a7ea
@fperellaholfeld
Feature/frontend admin route (#51)
e736b1f
@d3li0n
[Feature] Setting up database connection and backend (#42)
9bf9ac7
@KafkaNoNeko @d3li0n
@ishikaubc @BennettChang @fperellaholfeld
Weekly logs (#18)
225e951 
Co-authored-by: Dima Zhuravel <dmitrozhyravel@gmail.com>
Co-authored-by: Ishika Agarwal <105883848+ishikaubc@users.noreply.github.com>
Co-authored-by: Bennett Chang <bv2cq_b@outlook.com>
Co-authored-by: fperellaholfeld <fperellaholfeld@gmail.com>
Co-authored-by: BennettChang <108947000+BennettChang@users.noreply.github.com>
Co-authored-by: Francisco Perella-Holfeld <68356602+fperellaholfeld@users.noreply.github.com>
@d3li0n
[Feature] Add support of Google OAuth to the system (#49)
6e8a5b7
@d3li0n
[Feature] System roles (#52)
9fde02b
@d3li0n
[Feature] Allow students to change their user details (#54)
1cc874f
@d3li0n
[Bug Fix] Fix an issue with docker containers not being able to insta…
681fa18 
…ll all of the node modules (#58)
@fperellaholfeld
Chore/add flowbite library (#57)
ea5574e
@d3li0n
resolve merge conflicts
1ea3159
@d3li0n @fperellaholfeld
[Feature] Navigation sidebar (#65)
5b3bb65 
Co-authored-by: fperellaholfeld <fperellaholfeld@gmail.com>
@d3li0n
[Feature] Save avatar URLs from Google OAuth in database (#60)
ca85caf
@fperellaholfeld @d3li0n
Added course creation modal and Fixed Flowbite Component styling (#67)
70a86b6 
Co-authored-by: Dima Zhuravel <dmitrozhyravel@gmail.com>
@fperellaholfeld @d3li0n
Chore/add flowbite library (#63)
83d018d 
Co-authored-by: Dmytro Zhuravel <dmitrozhyravel@gmail.com>
@KafkaNoNeko @d3li0n
[Bug] Fix frontend docker container not building (#70)
4a56505 
Co-authored-by: Dmytro Zhuravel <dmitrozhyravel@gmail.com>
@BennettChang @d3li0n
added database tables for courses and exams (#68)
51a2458 
Co-authored-by: Dima Zhuravel <dmitrozhyravel@gmail.com>
@d3li0n @BennettChang
[Feature] Allow students to join the course (#74)
1601148 
Co-authored-by: Bennett <bv2cq_b@outlook.com>
@d3li0n
[Enhancement] Create user Avatars from URLs and initials (#79)
f9c6ce5
@d3li0n
[Feature] Allow admins to create new semesters (#76)
13443a2
@fperellaholfeld @d3li0n
[Feature] Implemented Student and Instructor Dashboard and Course Cre…
7a33507 
…ation Modal Form (#80)

Co-authored-by: Dima Zhuravel <dmitrozhyravel@gmail.com>
@ishikaubc @d3li0n @fperellaholfeld
Feature frontend authentication (#62)
0c520ce 
Co-authored-by: Ishika Agarwal <ishikaagarwal@Ishikas-MBP.lan>
Co-authored-by: Ishika Agarwal <ishikaagarwal@Ishikas-MacBook-Pro.local>
Co-authored-by: Dima Zhuravel <dmitrozhyravel@gmail.com>
Co-authored-by: fperellaholfeld <fperellaholfeld@gmail.com>
@BennettChang
[Feature] Added course creation and query for courses by user id endp…
2a285ac 
…oints (#81)
@fperellaholfeld @d3li0n
Feature/bubble sheet generator (#87)
d39d1ae 
Co-authored-by: Dmytro Zhuravel <dmitrozhyravel@gmail.com>
d3li0n and others added 11 commits July 30, 2024 18:56
@d3li0n
[Enhancement] Allow professors to change to whom submission belongs a…
89f3bac 
…nd flag submissions with issues (#400)
@d3li0n
[Enhancement] (Backend) Update submission grade based on the answer o…
d3de7dd 
…bject (#402)
@d3li0n
resolve merge conflicts
32bc037
@d3li0n
resolve merge conflict
fb8cb6c
@d3li0n
update lock file
ad51c13
@d3li0n
[Bugs] Address existings bugs (#414)
ed615e3
@d3li0n
[Enhancement] Allow instructors to hide grades when grades were previ…
ea25f7b 
…ously released (#399)
@BennettChang @d3li0n
[Feature] Frontend Bubblesheet UI (#403)
244a684 
Co-authored-by: Dima Zhuravel <dmitrozhyravel@gmail.com>
@ishikaubc @d3li0n
[Feature]Allow instructors to remove a student from the course. (#378)
cdb5bc7 
Co-authored-by: Ishika Agarwal <ishikaagarwal@Ishikas-MacBook-Pro.local>
Co-authored-by: Ishika Agarwal <ishikaagarwal@Ishikas-MBP.lan>
Co-authored-by: Dima Zhuravel <dmitrozhyravel@gmail.com>
@d3li0n
[Bug] FIxing bugs during test o rama (#427)
aab6803
@d3li0n
[Bug] Copying invite link doesn't work in production server due to se…
47f5eec 
…rver running in HTTP mode (#432)
@d3li0n d3li0n added the chore provides value to team rather than client. Ex. implementing continuous integration/refactoring label Aug 5, 2024
@d3li0n d3li0n self-assigned this Aug 5, 2024
@d3li0n d3li0n marked this pull request as ready for review August 6, 2024 05:46
fperellaholfeld
fperellaholfeld approved these changes Aug 6, 2024
View reviewed changes
Copy link
Contributor

@fperellaholfeld fperellaholfeld left a comment

Choose a reason for hiding this comment

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

As far as I have tested, all of the pages are working properly, I think this is able to be merged.

d3li0n and others added 5 commits August 6, 2024 16:39
@d3li0n
resolve merge conflict issue
ed2d461
@ishikaubc @d3li0n @KafkaNoNeko
refactor FAQ (#430)
f8da389 
Co-authored-by: Ishika Agarwal <ishikaagarwal@Ishikas-MacBook-Pro.local>
Co-authored-by: Dmytro Zhuravel <dmitrozhyravel@gmail.com>
Co-authored-by: Paula <paula.wong-chung@alumni.ubc.ca>
@d3li0n @KafkaNoNeko
[Chore] Repository cleanup (#265)
ab00aae 
Co-authored-by: Paula <paula.wong-chung@alumni.ubc.ca>
@fperellaholfeld @d3li0n @KafkaNoNeko
Feature omr full pipeline (#405)
ff9c489 
Co-authored-by: Dmytro Zhuravel <dmitrozhyravel@gmail.com>
Co-authored-by: Paula <paula.wong-chung@alumni.ubc.ca>
@d3li0n
Merge branch 'master' into development
18aafbf
BennettChang
BennettChang approved these changes Aug 7, 2024
View reviewed changes
Copy link
Contributor

@BennettChang BennettChang left a comment

Choose a reason for hiding this comment

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

LGTM

@d3li0n d3li0n merged commit c19bfd5 into master Aug 7, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fperellaholfeld fperellaholfeld fperellaholfeld approved these changes

@BennettChang BennettChang BennettChang approved these changes

@KafkaNoNeko KafkaNoNeko Awaiting requested review from KafkaNoNeko

@ishikaubc ishikaubc Awaiting requested review from ishikaubc

Assignees

@d3li0n d3li0n

Labels
chore provides value to team rather than client. Ex. implementing continuous integration/refactoring
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@d3li0n @fperellaholfeld @BennettChang @KafkaNoNeko @ishikaubc