Skip to content

Commit d27e242

Browse files
committed
Merge branch 'develop'
2 parents 3702590 + 96ba4a0 commit d27e242

File tree

98 files changed

+5572
-2141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+5572
-2141
lines changed

.github/CHANGELOG.rst

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,36 @@
22
Change Log
33
==========
44

5+
2.11.0 (Tonkinese)
6+
------------------
7+
*Release date: 9 November 2025*
8+
9+
- Improved publication control
10+
- Created mechanism to release team draw before full draw with adjudicators, and info-slides before motions
11+
- Motions and info-slides can be released from presentation interface
12+
- Improvements to allocation screens
13+
- Allocations for concurrent rounds can be made on a single page, ensuring no double-booking
14+
- The maximum number of times an adjudicator has met a team or other adjudicator is shown
15+
- Room constraints are shown during room allocation
16+
- Participants can opt-in to receive personalised browser push notifications on draw and motion release
17+
- On draw deletion, panels can be transferred to preformed
18+
- Added feedback weight modal in Feedback Overview
19+
- Added default "access officer" permission group, and increased the scope of CA permissions
20+
- Show adjudicators' own ballot even when unconfirmed in private URL
21+
- Improve handling of ``{{ URL }}`` variable in private URL email template
22+
- Set draw table bracket highlights from frontend to be responsive with sorting.
23+
- Prevented conflicts when many people simultaneously generate a draw
24+
- API improvements:
25+
- Most (except passwords) tournament preferences are now exposed publicly
26+
- Used serializers to validate query parameters
27+
- Added registration fields to tournament-institution endpoint
28+
- Don't require registration question answers when authenticated
29+
- Add user permissions when creating user
30+
- Removed ability to disable the API. Thank you to Teymour Aldridge for their PR!
31+
- Implemented initial tests for tournament and round APIs. Thank you to Séb for their work!
32+
- \+ bug fixes and optimizations!
33+
34+
535
2.10.0 (Sphynx)
636
---------------
737
*Release date: 6 July 2025*

.github/workflows/django.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
services:
1919
postgres:
20-
image: postgres:12
20+
image: postgres:18
2121
env:
2222
POSTGRES_USER: postgres
2323
POSTGRES_PASSWORD: postgres

Pipfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ drf-spectacular = "*"
4040
daphne = "*"
4141
drf-link-header-pagination = "*"
4242
networkx = "*" # Avoid its dependencies (SciPy)
43+
django-push-notifications = {extras = ["wp"], version = "*"}
4344

4445
[dev-packages]
4546
pre-commit = "*"

Pipfile.lock

Lines changed: 2037 additions & 997 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/nginx.conf

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,28 @@ http {
107107
etag on;
108108
}
109109

110+
# Serve root-level static files
111+
location = /robots.txt {
112+
alias /tcd/tabbycat/staticfiles/root/robots.txt;
113+
access_log off;
114+
add_header Cache-Control "public";
115+
expires 1d;
116+
}
117+
118+
location = /favicon.ico {
119+
alias /tcd/tabbycat/staticfiles/root/favicon.ico;
120+
access_log off;
121+
add_header Cache-Control "public";
122+
expires 7d;
123+
}
124+
125+
location = /navigatorPush.service.js {
126+
alias /tcd/tabbycat/staticfiles/root/navigatorPush.service.js;
127+
access_log off;
128+
add_header Cache-Control "public";
129+
expires 1d;
130+
}
131+
110132
# Pass to wsgi server
111133
location / {
112134
proxy_set_header Host $http_host;

config/nginx.conf.erb

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,28 @@ http {
109109
etag on;
110110
}
111111

112+
# Serve root-level static files
113+
location = /robots.txt {
114+
alias /app/tabbycat/staticfiles/root/robots.txt;
115+
access_log off;
116+
add_header Cache-Control "public";
117+
expires 1d;
118+
}
119+
120+
location = /favicon.ico {
121+
alias /app/tabbycat/staticfiles/root/favicon.ico;
122+
access_log off;
123+
add_header Cache-Control "public";
124+
expires 7d;
125+
}
126+
127+
location = /navigatorPush.service.js {
128+
alias /app/tabbycat/staticfiles/root/navigatorPush.service.js;
129+
access_log off;
130+
add_header Cache-Control "public";
131+
expires 1d;
132+
}
133+
112134
# Pass to wsgi server
113135
location / {
114136
proxy_set_header Host $http_host;

0 commit comments

Comments
 (0)