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

Dev merge main #143

Merged
merged 188 commits into from
Feb 2, 2024
Merged

Dev merge main #143

merged 188 commits into from
Feb 2, 2024

Conversation

V-Fries
Copy link
Collaborator

@V-Fries V-Fries commented Feb 2, 2024

Merged main on dev

tdameros and others added 30 commits January 6, 2024 18:58
@tdameros
create DigitalOcean client
480fed1
@tdameros
create SSHClient
f33f97f
@tdameros
create restore deployment workflow
665ba39
@tdameros
create update deployment workflow
5c3fb2b
@tdameros
Merge pull request #31 from tdameros/autodeploy
af3bc10 
Autodeploy
@EthanDelage
Tournament creation (#24)
aaca5a6 
* Add documentation for tournament endpoints

* Add POST /tournament endpoint

* refactor TournamentView.post()

* PEP8 OK

* Add tournament CI
@EthanDelage
Fix documentation
d99125f
@EthanDelage
Add GET /tournament endpoint
6f085c8
@a-levra
renamed refresh-jwt into refresh-access-jwt
3b744f6
@a-levra
added the /user/{user_id} route that gives the username linked to a u…
9b4f999 
…ser id
@a-levra
fix tests
d942522
@EthanDelage
Add DELETE /tournament/{id} endpoint with tests
a54868e
@EthanDelage
Add test for GET /tournament
697e5f9
@EthanDelage
Add DELETE /tournament endpoint
6820cc4
@EthanDelage
Add GET /tournament/{id}/players endpoint
36e9cf2
@EthanDelage
Add POST /tournament/{id}/players endpoint
f856231
@EthanDelage
Add nb-players field in response of GET /tournament/{id}/players …
7c7b8cd 
…endpoint
@a-levra
Merge pull request #36 from tdameros/renaming
94064f0
@a-levra
removed unuseful line
dc77dca
@a-levra
Merge branch 'main' into 37-add-get-user-user_id-route
f6d1d41
@EthanDelage
Add test for TournamentPlayersView
b78d6d2
@EthanDelage
Add GET /tournament/{id} endpoint with tests
13e716c
@EthanDelage
check if a player is not already in another ongoing tournament in `PO…
1469064 
…ST /tournament/{id}/players`
@EthanDelage
Add PATCH /tournament/{id}/update-settings endpoint with tests
b8073ab
@EthanDelage
Merge pull request #38 from tdameros/37-add-get-user-user_id-route
218eadc 
added the /user/{user_id} route
@EthanDelage
refactoring
5d4c6b9
@EthanDelage
Merge branch 'main' into manage-tournament-endpoint
c6ef49d
@EthanDelage
Authenticate request in each endpoint
4b468e9
@hferraud
delete old django project
fa9953c
@hferraud
add matchmaking server
d3e36f9
a-levra and others added 20 commits February 1, 2024 15:47
@a-levra
fixed UM documentation (#129)
0fb5def
@hferraud
add /match/ and /user/{id}/history/ documentation
b792b10
@hferraud
implement /match/ and /user/{id}/history/ endpoints
92c9722
@hferraud
add test for /match/ endpoint
794d6b1
@hferraud
add test for /user/{id}/history/ endpoint
f3955be
@hferraud
add migration
c6cba32
@hferraud
add corsheaders
a666f59
@hferraud
fix pep8 and isort
556e08c
@hferraud
fix integer validation for pages queries
398ffab
@hferraud
implement basic progress endpoint logic
093e36e
@hferraud
rename games into matches
47ffab3
@hferraud
Add test for /user/{id}/progress/
ee381be
@hferraud
fix pep8 and isort
d25be1e
@hferraud
Merge branch 'main' into user-stats-progress
e13e0ea
@hferraud
rename game into match in error messages
5318515
@hferraud
Merge pull request #131 from tdameros/user-stats-progress
eb3df31 
User stats progress
@a-levra
UM refacto : splitted views.py into several files (#130)
bbd160e 
* UM refacto : splitted views.py into several files

* snake case for all files
@hferraud
Add doc for '/user/{id}/progress/' endpoint
5f01c68
@tdameros
Merge pull request #134 from tdameros/user-stats-progress-doc
2a032fb 
Add doc for '/user/{id}/progress/' endpoint
@V-Fries
Merged main
742e5e7
@V-Fries V-Fries self-assigned this Feb 2, 2024
@V-Fries V-Fries merged commit 8ee3312 into dev Feb 2, 2024
6 checks passed
@V-Fries V-Fries deleted the dev-merge-main branch February 2, 2024 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hferraud hferraud hferraud approved these changes

@a-levra a-levra a-levra approved these changes

@tdameros tdameros Awaiting requested review from tdameros

@EthanDelage EthanDelage Awaiting requested review from EthanDelage

Assignees

@V-Fries V-Fries

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@V-Fries @hferraud @a-levra @tdameros @EthanDelage