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

Merge develop branch into master #93

Merged
merged 77 commits into from
Sep 2, 2024
Merged

Merge develop branch into master #93

merged 77 commits into from
Sep 2, 2024

Conversation

filvanh
Copy link
Collaborator

@filvanh filvanh commented Sep 2, 2024

Changes 💎

Short one-liner about the content

  • Describe the changes your pull request makes in short terms
    • If either of the topics here targets a specific issue, this should be referenced
  • You can use a list to describe multiple change
    • Use subpoints to describe smaller changes or details within the change

Notes 📖 ✏️

Write a few notes about the changes made if necessary.

ThomasBakkenMoe-Computas and others added 30 commits June 21, 2024 14:42
@ThomasBakkenMoe-Computas
Add or update the Azure App Service build and deployment workflow config
7965073
@ThomasBakkenMoe-Computas
Updates dependencies
83d3bcd
@ThomasBakkenMoe-Computas
Adds config.json.example file
f25cea1
@ThomasBakkenMoe-Computas
Updates CV_PREDICTION_ENDPOINT example
898225f
@andreasrberg
Changed predict image by post function
5765fcb
@ThomasBakkenMoe-Computas
Merge pull request #76 from computas/bug/fix-prediction-endpoint
d85ff89 
Changed predict image by post function
@ThomasBakkenMoe-Computas
Merge remote-tracking branch 'origin/develop' into develop
0e41486
@ThomasBakkenMoe-Computas
Adds .idea folder to .gitignore
578f390
@andreasrberg
Changed models to match singleplayer backend
b6f3e36
@andreasrberg
Merge pull request #77 from computas/SP24-378-Get-multiplayer-backend…
415b9a3 
…-up-and-running

Changed models to match singleplayer backend
@ComputasAlex
multiplayer label language:
035d9ea 
- Return labels in both languages to frontend
- sockets hard to work with so check language in frontend
@ComputasAlex
exclude venv from format & lint
27d0ae7
@ComputasAlex
format
4566f29
@ComputasAlex
fixes logger error
164d541
@andreasrberg
Merge pull request #78 from computas/SP24-441-multiplayer-label-language
f8606bc 
Correct label language
@ComputasAlex
Adds difficulty IDs enum to utilities
e1b84e6
@ComputasAlex
Adds difficulty_id to Scores model and get highscore methods
7226cdc
@ComputasAlex
Adds highscore endpoints to multiplayer
33f5e76
@ComputasAlex
Adds difficulty to scores tests
73e5933
@ComputasAlex
format
7a3274c
@ComputasAlex
Changes difficulty_id magic number 4 to Enum variable
a7bfc6d
@ComputasAlex
Merge pull request #79 from computas/SP24-390-highscore-difficulty-mu…
b5cad25 
…ltiplayer

Adds highscore feature to multiplayer
@ComputasAlex
Fixes classifying in correct language in multiplayer
153f44f
@ComputasAlex
Merge branch 'develop' into SP24-441-multiplayer-label-language
a2a6b7e
@ComputasAlex
Merge pull request #80 from computas/SP24-441-multiplayer-label-language
701e0a5 
Multiplayer AI guessing in english
@ComputasAlex
Fixes database error upon deleting old records. Changes to > 1 day ol…
48a0767 
…d because of highscore
@ComputasAlex
Merge branch 'develop' into SP24-485-Fix-multiplayer-backend-error-me…
e20703a 
…ssages-upon-deleting-old-data
@ComputasAlex
Merge pull request #81 from computas/SP24-485-Fix-multiplayer-backend…
dd7e0a9 
…-error-messages-upon-deleting-old-data

Fix multiplayer deletion errors
@andreasrberg
added getExampleDrawings socket endpoint
e6f3b55
@andreasrberg
removed print
66908ee
ellenyuX and others added 28 commits August 13, 2024 12:08
@ellenyuX
fixed small typo in yaml
6b83067
@ellenyuX
another small fix
5748346
@ellenyuX
added another test folder with tests
7917827
@ellenyuX
trying to fix fault at workfile yaml
2622154
@ellenyuX
working on yaml
274be12
@ellenyuX
fixing yaml
46264f5
@ellenyuX
hoping this yaml is working
b89d3a6
@ellenyuX
working on and testing yaml
4f9e4de
@ellenyuX
testing
050aa20
@ellenyuX
hope this works
a999555
@ellenyuX
running the correct python tests
01af2d4
@ellenyuX
doing some debugging
f6c2fee
@ellenyuX
added necessary filepaths
9457ce5
@ellenyuX
Fixed tests for test_db.py
0c8475a
@ellenyuX
Small mods
90c1f9e
@ellenyuX
deleted unused tests
ff4741e
@Ivan-Computas
add pytest config file
922a037
@Ivan-Computas
Merge pull request #89 from computas/SP24-702-testing-workflows
0dcd27b 
Sp24 702 testing workflows
@Ivan-Computas
Add difficulty id to websockets tests
ebc9b78
@Ivan-Computas
Add language to websockets tests
5de739b
@Ivan-Computas
clean up after testing is done
e4a6c07
@Ivan-Computas
clean linter faults
41ba6f8
@ellenyuX
Added test for the future
2944747
@ellenyuX
Added a simple test
7587c92
@Ivan-Computas
Merge pull request #90 from computas/SP24_714_rewrite_tests_websockets
9dd5aa2 
Sp24 714 rewrite tests websockets
@Ivan-Computas
Update master workflow
dddc820
@Ivan-Computas
Merge pull request #92 from computas/SP24_703_update_master_workflow
ea834a2 
Update master workflow
@Ivan-Computas
Merge pull request #91 from computas/SP24_714_add_test
adfc91f 
Sp24 714 add test
@Ivan-Computas Ivan-Computas merged commit 9b26516 into master Sep 2, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ivan-Computas Ivan-Computas Ivan-Computas 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.
8 participants
@filvanh @Ivan-Computas @ThomasBakkenMoe-Computas @andreasrberg @ComputasAlex @sondrefj @ellenyuX @TobiasHermansen-Computas