Upstream: Embed PDF in answers, Tooling & Dep upgrades, Bugfixes#80
Merged
yutotakano merged 158 commits intocompsoc-edinburgh:masterfrom Mar 12, 2026
Merged
Conversation
Allow markdown in announcement See merge request vseth/sip-com-apps/community-solutions!591
Make buttons less annoying See merge request vseth/sip-com-apps/community-solutions!593
Feedback sorting Closes #383 See merge request vseth/sip-com-apps/community-solutions!594
A lot of migrations seem to have missing dependencies...
…-server-error' into 'master'
Fix endpoints "/api/document/{author}/{slug}/files/" and "/api/document/{author}/{slug}/files/{oid}" returning "500 Internal Server Error"
Closes #388 and #387
See merge request vseth/sip-com-apps/community-solutions!611
Add tblib to backend development dependencies to see UT exception tracebacks See merge request vseth/sip-com-apps/community-solutions!613
Fix auth failing locally when time to expiry < timezone offset to UTC See merge request vseth/sip-com-apps/community-solutions!612
Django Ninja allows us to retrofit our existing Django application to have modern type-validated input/output schemas, as well as OpenAPI documentation. Something similar with FastAPI has proven to be very useful in VISIT for auto-generating request hooks for the frontend, as well as guaranteeing safety in HTTP I/O compared to manually checking request.DATA. OpenAPI documentation is at /api/docs OpenAPI JSON description is at /api/openapi.json This commit migrates only the three /api/feedback endpoints. Unit tests pass. All other routes are unaffected.
Migrate to React Router v6 See merge request vseth/sip-com-apps/community-solutions!579
…e-after-hmr' into 'master' Migrate to ahooks v2 Closes #367 See merge request vseth/sip-com-apps/community-solutions!615
…source-code' into 'master' Resolve "Cannot select data in 'Supported Markdown Functions' source code" Closes #368 See merge request vseth/sip-com-apps/community-solutions!616
…ons' into 'master' Add mermaid support for exam solutions Closes #290 See merge request vseth/sip-com-apps/community-solutions!608
addendum to !608 & #290
add mermaid section to supported functions popup See merge request vseth/sip-com-apps/community-solutions!617
Use Django Ninja experimentally for feedback APIs See merge request vseth/sip-com-apps/community-solutions!614
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains upstream changes between 2026/01/25 and 2026/03/12.
The specific range is (51a5804, 2be9850], where 51a5804 was the last commit that was merged into BI File Collection as part of #79.
Exhaustive List of Changes
New Features
uvandmiseBug fixes
umijs/hookswithahooksChores
use-query-params,pyyaml,psycopg2-binary,pyroscope-iobumped minor versionsThe following commits are also included, but are not relevant to us
I list them here so that it serves as an exhaustive description of all commits that the PR contains when doing git blame etc in the future.
DB Model Changes
answers.AnswerKindwas added to distinguish "official" answers vs "personal" answersanswers.ExamWordandanswers.ExamPageFlowwere removed as part of the PyPdfium2 migrationscoreboard.scoreboard_userscorePostgres view now has a column for official answersMerge
I've done a manual merge with our repo. UTs pass and the frontend looks fine. Thus, if the CI passes, I will merge with full responsibility.
Migration of local database
As part of a bugfix to Docker Compose creating a redundant local database (
docker&postgres), if you have previously set up a local database you will need to migrate it. (You'll know if you need to do this, if you run Postgres via D-C and it complains about not finding thepostgresuser.)