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

Final merge 🎉 #297

Merged
merged 556 commits into from
May 23, 2024
Merged

Final merge 🎉 #297

merged 556 commits into from
May 23, 2024

Conversation

AWerbrouck
Copy link
Contributor

No description provided.

usserwoutV2 and others added 30 commits May 16, 2024 09:53
@usserwoutV2
Fixed incorrect API route
6d2bb37
@AWerbrouck
Merge branch 'frontend' into feature/submissionUpload-2
0f06865
@AWerbrouck
Merge pull request #260 from SELab-2/feature/submissionUpload-2
d964342 
Feature/submission upload 2
@Triver1
Added docker zip file uploading
ef946cf
@badduck32
gevraagde changes geimplementeerd
fc62123
@arnedierick
added lots of extra frontend tests
a193b27
@arnedierick
added final component tests so all finished components/pages are prop…
9d3148c 
…erly tested now
@usserwoutV2
Fixed course description not rendering markdown
d708cf2
@usserwoutV2
Fixed markdown not rendering
ce66035
@usserwoutV2
Added new docker dir upload btn
7be5e77
@usserwoutV2
Added api requests for upload tests directory
b7b0b77
@usserwoutV2
Bug fixes
394c169
@badduck32
submissions geupdated zodat ze met nieuwe soorten feedback kunnen omgaan
e4a17d9
@Aqua-sc
Update populate_database.sql
f7ae28f
@Aqua-sc
Uploading/deleting/getting extra testfiles
9aac6db
@Aqua-sc
rename util folder to extra + call addUtilFiles
35f9b02
@Aqua-sc
Allow admin to submit
abc8b56
@Aqua-sc
Update SubmissionController.java
ff585a6
@usserwoutV2
added extra submission status
a06f744
@badduck32
extra functionaliteit submissioncard
12170ee
@badduck32
submission ongeveer af
b449311
@badduck32
vertalingen
54c4257
@Aqua-sc
Keep filename of uploaded extratestfiles
87fa0a8
@Aqua-sc
Updated submissionControllerTests
fe8daf8
@Aqua-sc
TestControllTest updated
f0224e1
@Aqua-sc
All test updated now
af3fe07 
DockerSubmissionTestTest still fails for some reason
@Aqua-sc
Updated tests
e960f7e
@Aqua-sc
visible_after field works
6401ca7
@Aqua-sc
Added studentnumber fields
4f94fb4
@Aqua-sc
Update tests
e106cd8
Aqua-sc and others added 29 commits May 23, 2024 18:46
@Aqua-sc
Merge pull request #288 from SELab-2/share-fix
b3da71d 
Changes with invite link
@Aqua-sc
update dockertestdirtooltip
76f9efc
@Aqua-sc
Merge branch 'frontend' of https://github.com/SELab-2/UGent-6 into fr…
ca76d0b 
…ontend
@Triver1
added container menu dropdown
8e0f1f7
@badduck32
made the search bar cleaner and fixed some minor bugs
1ae37c3
@Triver1
Merge branch 'frontend' into test_page_update
51881a3 
# Conflicts:
#	frontend/src/components/forms/projectFormTabs/DockerFormTab.tsx
@AWerbrouck
Delete app.conf
1c522ed
@AWerbrouck
Delete nuke.sh
7d193fe
@Aqua-sc @usserwoutV2
start docker toggle fix
6a544db 
(doesn't work yet, pushing to get help)
@usserwoutV2
Fixed requested issue (I think)
90bf392
@usserwoutV2
Attempt 2 to fix docker mode switch
6c90413
@usserwoutV2
Fixed docker form not always saving
3470f1b
@usserwoutV2
Fixed typescript err
9bd9b31
@Aqua-sc @usserwoutV2
start docker toggle fix
368c6f7 
(doesn't work yet, pushing to get help)
@usserwoutV2
Fixed requested issue (I think)
75667d7
@usserwoutV2
Attempt 2 to fix docker mode switch
c7ec782
@usserwoutV2
Fixed docker form not always saving
1f786b1
@Aqua-sc
Fixed so can't change own file
eace8d9
@usserwoutV2
Fixed 100 000 merge conflicts
b145026
@Aqua-sc
Fix test failure
b2e85a3
@Aqua-sc
Fix error message edit role
87c9415
@Aqua-sc
Merge pull request #294 from SELab-2/search-bar-fix
caea261 
Search bar changes
@Aqua-sc
Merge pull request #293 from SELab-2/test_page_update
90642fc 
Added dropdown and updates to the testpage
@Aqua-sc
Merge branch 'development' into frontend
3410bd8
@Aqua-sc
Merge branch 'frontend' of https://github.com/SELab-2/UGent-6 into fr…
ce6dd2c 
…ontend
@Aqua-sc
Merge pull request #295 from SELab-2/frontend
7549026 
Frontend
@usserwoutV2
Fix tests
1140909
@usserwoutV2
tests
092af13
@usserwoutV2
Merge pull request #296 from SELab-2/dev-test
36a3514 
tests
@AWerbrouck AWerbrouck merged commit 88e3ab9 into main May 23, 2024
1 check passed
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.
7 participants
@AWerbrouck @usserwoutV2 @Triver1 @badduck32 @arnedierick @Aqua-sc @Matthias-VE