lukas
/
timetracker
1
0
Fork 0
Code Issues 17 Pull Requests 4 Actions Packages Projects 1 Releases 20 Wiki Activity

Filters (backend and frontend) #74

Open
lukas wants to merge 2 commits from filters into main
pull from: filters
merge into: lukas:main
Conversation 0 Commits 2 Files Changed 11 +370 -29
lukas commented 2024-09-03 13:30:03 +00:00
Owner
Copy Link
No description provided.
lukas added 2 commits 2024-09-03 13:30:03 +00:00
Django CI/CD / test (push) Successful in 1m4s Details
Django CI/CD / build-and-push (push) Has been skipped Details
d98758f751
add backend functionality
lukas force-pushed filters from d98758f751 to c2f1d8fe0a 2024-09-03 13:30:58 +00:00 Compare
All checks were successful
Django CI/CD / test (push) Successful in 50s
Details
Django CI/CD / build-and-push (push) Has been skipped
Details
This pull request has changes conflicting with the target branch.
  • common/utils.py
  • games/static/base.css
  • games/templates/cotton/button.html
  • games/templates/cotton/simple_table.html
  • games/views/device.py
  • games/views/edition.py
  • games/views/game.py
  • games/views/platform.py
  • games/views/purchase.py
  • games/views/session.py
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b filters main
git pull origin filters

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff filters
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
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: lukas/timetracker#74
No description provided.
Delete Branch "filters"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?