Skip to content

v1.0.0#13

Open
TingEnChang wants to merge 67 commits into
test123:masterfrom
kaye-s:versionone
Open

v1.0.0#13
TingEnChang wants to merge 67 commits into
test123:masterfrom
kaye-s:versionone

Conversation

@TingEnChang
Copy link
Copy Markdown

No description provided.

kaye-s and others added 30 commits February 11, 2026 17:41
This reverts commit 0ae235d.

# Conflicts:
#	testquery.py
…, with model for AnalysisTask including request structure, user, language etc. Some simple tests on creation, APIView endpoint for analysis task and status endpoint. Uses serializer to interpret data from frontend
# Conflicts:
#	front-end/index.html
Initial backend commit: barebones backend inside app folder GroupFive…
…ts. Added database integration lacking actual database and user
… Renamed testquery,py as it was conflicting with some python test naming.
Simple Login and Register pages. Needs to be linked to backend
kaye-s and others added 30 commits March 19, 2026 15:42
…paste code button is broke. good news login page is almost fully connected
Refactored everything in main branch
# Conflicts:
#	front-end/index.html
#	front-end/scripts/upload.js
#	front-end/styles/style.css
Connected register to database, modified login to refer to our user model
fixed merging errors and updated everything with the changes
# Conflicts:
#	api/urls.py
#	api/views.py
#	front-end/index.html
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants