Skip to content

Merge Master #295

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

Merged
Suboyyy merged 16 commits into from
Nov 26, 2025
Merged

Merge Master #295

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4385235
fix: remove rent filtering in fetchUserItems
Suboyyy Nov 14, 2025
0263d26
fix: comment out rent filtering logic in fetchUserItems
Suboyyy Nov 14, 2025
d0eaf53
fix: test after rent item modification
Suboyyy Nov 14, 2025
57e54dc
fix: president + color in white
Remi-pcn Nov 17, 2025
7773bda
fix: color
Remi-pcn Nov 17, 2025
6dc6d27
ci: not use prisma 7
Suboyyy Nov 20, 2025
55f390e
ci: dockerfile disable prisma7
Suboyyy Nov 20, 2025
044665e
fix: update Discord invite links and year references in email templates
Suboyyy Nov 20, 2025
fc50633
feat: 2025 tickets
Suboyyy Nov 25, 2025
e931692
fix: resize ticket
Suboyyy Nov 25, 2025
fae9b0b
fix: text color
Suboyyy Nov 25, 2025
5884c6f
fix: billet text position
Suboyyy Nov 25, 2025
75cda39
Merge branch 'master' into dev
Suboyyy Nov 25, 2025
dedb30d
fix: date on tickets
Suboyyy Nov 25, 2025
b346bcb
Merge branch 'dev' of github.com:ungdev/UA-api into dev
Suboyyy Nov 25, 2025
9ba1e10
Merge remote-tracking branch 'origin/master' into dev
Suboyyy Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/email/backgrounds/ticket.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading