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

feat: D5 to D7 #82

Merged
merged 314 commits into from
Nov 14, 2024
Merged

feat: D5 to D7 #82

merged 314 commits into from
Nov 14, 2024

Conversation

tituschewxj
Copy link

@tituschewxj tituschewxj commented Nov 13, 2024 •
edited
Loading

Merges the changes from D5 to D7 to main

Note: remember to tag the commit after this is merged.

chiaryan and others added 30 commits October 27, 2024 21:44
@chiaryan
Implement authentication blocked pages using middleware
5943995
@solomonng2001
Add history service and frontend code submission
9f804b1
@solomonng2001
Add Dockerise history service and update readme and environment example
b1fa2ec
@solomonng2001
Merge branch 'staging' into solomon/code-execute
5d0c765
@solomonng2001
Update test.yml and add history-service and firebase for history-service
8928086
@solomonng2001
Update test.yml
0aa84e3
@solomonng2001
Update test.yml
0693873
@solomonng2001
Update test.yml
e5b7293
@solomonng2001
Update test.yml
56dd8e6
@solomonng2001
Update test.yml
aadd46c
@solomonng2001
Update test.yml
63dd460
@solomonng2001
Update test.yml
f50b89a
@solomonng2001
Update test.yml
81c4e36
@solomonng2001
Update test.yml
6ad4bff
@solomonng2001
Update test.yml
b3bc499
@solomonng2001
Update test.yml
49dbd3c
@solomonng2001
Update test.yml
0bde1d1
@solomonng2001
Update test.yml
ae4f691
@bensohh
Change connected user status to fetch using provider awareness
3ee517c
@chiaryan
clean up unused imports
5a51c70
@solomonng2001
Update test.yml
81a09c5
@solomonng2001
Update test.yml
cab2b2c
@chiaryan
remove client-side redirects
cf36fca
@chiaryan
Merge branch 'staging' into ryan/auth-guard
de59434
@bensohh
Implement end collaboration session for both users, fix minor bugs wi…
b6a32db 
…th text html
@bensohh
Minor UI adjustment for modal
5be7f3c
@solomonng2001
Sync submission across webrtc and update history-service routing
3502e42
@solomonng2001
Merge pull request #55 from CS3219-AY2425S1/solomon/code-execute
ba383ad 
solomon/history-service
@bensohh
Merge branch 'staging' into ben/misc-collab
5f284c8
@bensohh
Fix commented providerRef error
1fc5c9f
solomonng2001 and others added 28 commits November 13, 2024 21:32
@solomonng2001
Store session info in localstorage
d16fb22
@tituschewxj
feat(frontend): add fetch functions for testcases
4243ae9
@chiaryan
Merge pull request #80 from CS3219-AY2425S1/titus/fix-frontend-error-…
368fa90 
…handling

fix: error handling and history pagination bug
@chiaryan
Add RabbitMQ URL to environment variables
9ca9d21
@tituschewxj
feat: add read for hidden tests
ed24f5a
@tituschewxj
feat(execution): fetch all tests for a qn
f14b98d
@bensohh
Update README.md to include docker-compose version reminder
cd73994
@bensohh
Update README.md to include troubleshooting comments
926427b
@tituschewxj
Merge pull request #76 from CS3219-AY2425S1/titus/update-readme
c7aaf40 
docs: update documentation
@tituschewxj
Merge pull request #87 from CS3219-AY2425S1/add-rabbitmq-url-to-workflow
91be737 
Add RabbitMQ URL to environment variables in test.yml
@bensohh
Merge pull request #85 from CS3219-AY2425S1/ben/n4-attempt
bd95eb0 
Attempt at N4 to add JavaScript into Code Editor
@bensohh
Merge branch 'staging' into solomon/save-submission-status-in-local-s…
8f08639 
…torage
@tituschewxj
feat: link with backend
983d9ae
@tituschewxj
feat: add loading icon
dc6fc17
@tituschewxj
feat: use active key for tabs
1b8eddb
@solomonng2001
Add javascript execution
542f9bb
@solomonng2001
Merge pull request #86 from CS3219-AY2425S1/solomon/save-submission-s…
e5642a7 
…tatus-in-local-storage

fix: store session info in localstorage
@solomonng2001
resolve merge conflicts
e23725b
@tituschewxj
Merge pull request #81 from CS3219-AY2425S1/question-tests-create-upd…
abf4605 
…ate-delete

Additional Integration tests for question service
@chiaryan
Merge pull request #83 from CS3219-AY2425S1/titus/add-ui-for-testcases
c236012 
feat: update frontend ui for testcases
@tituschewxj
Merge pull request #88 from CS3219-AY2425S1/solomon/add-execute-javas…
bb8cc46 
…cript

feat: n4 add javascript execution
@tituschewxj
Merge branch 'staging' into solomon/add-create-test
780aa3d
@tituschewxj
Merge pull request #75 from CS3219-AY2425S1/solomon/add-create-test
f01ba09 
feat: add create, update, delete test
@tituschewxj
fix(matching-service): 🚑 fix some issues with matching algorithm
6e57576 
Fix the matched difficulties and topics so that it will be an OR if either is empty. Also fixes an issue with difficulties matching using wrong variable topics.
@tituschewxj
fix: use matched user instead
e110913
@tituschewxj
Merge pull request #89 from CS3219-AY2425S1/titus/fix-matching-algo
609b491 
fix: matching algorithm
@tituschewxj
fix: enable scrolling in code editor
f7fd78d
@bensohh
Merge pull request #90 from CS3219-AY2425S1/titus/fix-code-editor-scroll
60f044f 
fix: enable scrolling in code editor
bensohh
bensohh approved these changes Nov 14, 2024
View reviewed changes
Copy link

@bensohh bensohh left a comment

Choose a reason for hiding this comment

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

LGTM

@tituschewxj tituschewxj merged commit d99ffbc into main Nov 14, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bensohh bensohh bensohh 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.
4 participants
@tituschewxj @bensohh @chiaryan @solomonng2001