Derk-Weijers/QPortal
1
0
Fork 0
Code Issues 9 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Added Steam integration to the allauth module #22

Open
Benny-Hoog wants to merge 2 commits from feat/8-add-steam-integration-to-django-allauth into main
pull from: feat/8-add-steam-integration-to-django-allauth
merge into: Derk-Weijers:main
Conversation 1 Commits 2 Files changed 8 +94 -8
Benny-Hoog commented 2026-01-22 21:02:18 +00:00 (Migrated from git.qstars.dev)
Copy link
No description provided.
Derk-Weijers (Migrated from git.qstars.dev) reviewed 2026-01-22 21:02:19 +00:00
This pull request has changes conflicting with the target branch.
  • pyproject.toml
  • src/accounts/migrations/0002_alter_customuser_groups_alter_customuser_is_active.py
  • src/static/common/images/google.svg
  • src/static/common/images/steam.svg
  • uv.lock
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/8-add-steam-integration-to-django-allauth:feat/8-add-steam-integration-to-django-allauth
git switch feat/8-add-steam-integration-to-django-allauth

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff feat/8-add-steam-integration-to-django-allauth
git switch feat/8-add-steam-integration-to-django-allauth
git rebase main
git switch main
git merge --ff-only feat/8-add-steam-integration-to-django-allauth
git switch feat/8-add-steam-integration-to-django-allauth
git rebase main
git switch main
git merge --no-ff feat/8-add-steam-integration-to-django-allauth
git switch main
git merge --squash feat/8-add-steam-integration-to-django-allauth
git switch main
git merge --ff-only feat/8-add-steam-integration-to-django-allauth
git switch main
git merge feat/8-add-steam-integration-to-django-allauth
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Derk-Weijers
Labels
Clear labels   
bug
Something is not working

  
duplicate
This issue or pull request already exists

  
enhancement
New feature

  
help wanted
Need some help

  
invalid
Something is wrong

  
question
More information is needed

  
refinement needed
More info is needed before it's ready

  
wontfix
This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
refinement needed
wontfix
Milestone
Clear milestone
No items
No milestone
0.2.0
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Derk-Weijers/QPortal!22
No description provided.