Skip to content

Commit 775750e

Browse files
Merge branch 'development' into cfp_flow_vue_migration
2 parents b7b3e70 + b651c32 commit 775750e

File tree

437 files changed

+95512
-49499
lines changed

Some content is hidden

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

437 files changed

+95512
-49499
lines changed

.github/workflows/tests.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ name: Tests
22

33
on:
44
push:
5-
branches: [ development ]
5+
branches: [development]
66
paths-ignore:
7-
- 'doc/**'
8-
- 'src/pretalx/locale/**'
7+
- "doc/**"
8+
- "src/pretalx/locale/**"
99
pull_request:
10-
branches: [ development ]
10+
branches: [development]
1111
paths-ignore:
12-
- 'doc/**'
13-
- 'src/pretalx/locale/**'
12+
- "doc/**"
13+
- "src/pretalx/locale/**"
1414

1515
permissions:
1616
contents: write
@@ -31,8 +31,8 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
python-version: [ 3.11 ]
35-
database: [ sqlite, postgres ]
34+
python-version: [3.11]
35+
database: [sqlite, postgres]
3636
services:
3737
postgres:
3838
image: postgres:15
@@ -56,15 +56,15 @@ jobs:
5656
- name: Set up node
5757
uses: actions/setup-node@v4
5858
with:
59-
node-version: 'latest'
59+
node-version: "latest"
6060
- name: Install system dependencies
6161
run: |
6262
sudo apt update
6363
sudo apt install -y gettext
6464
- name: Install uv
6565
uses: astral-sh/setup-uv@v5
6666
- name: Install Python dependencies
67-
run: uv sync --group test --no-install-project
67+
run: uv sync --group test --no-install-project && uv pip install Faker
6868
- name: Install Postgres dependencies
6969
run: uv sync --extra postgres --group test --no-install-project
7070
if: matrix.database == 'postgres'
@@ -88,10 +88,10 @@ jobs:
8888
--cov-report=term-missing:skip-covered \
8989
tests | tee pytest-coverage.txt
9090
env:
91-
PRETALX_CONFIG_FILE: 'tests/ci_${{ matrix.database }}.cfg'
91+
PRETALX_CONFIG_FILE: "tests/ci_${{ matrix.database }}.cfg"
9292
- name: Show coverage as build info
9393
working-directory: ./src
94-
shell: bash # needed to make echo work as expected
94+
shell: bash # needed to make echo work as expected
9595
run: |
9696
uv run -m coverage json
9797

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ ENV/
8080
.pydevproject
8181
.vscode
8282
.helix
83+
.zed
8384

8485
# IDEA / pycharm
8586
.idea/

CONTRIBUTORS

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
This is a list of contributors to pretalx. Contributions include things such
2+
as patches, reported bugs, added translations, answered questions, improved
3+
documentation, or generally making pretalx awesome. It's very much appreciated!
4+
5+
Akos Zsolt Hochrein
6+
András Veres-Szentkirályi
7+
Benjamin Bach
8+
Bruno Morisson
9+
Chris Wolf
10+
David Ellis
11+
Dominik Helle
12+
Emmanouil Kampitakis
13+
Florian Klien
14+
Florian Mösch
15+
Frantisek Holop
16+
Franziska Kunsmann
17+
Hal Seki
18+
Jahongir Rahmonov
19+
Jakob Schnell
20+
Johan Van de Wauw
21+
Jonas Große Sundrup
22+
Katie McLaughlin
23+
Leah Oswald
24+
Lukas Prokop
25+
Lyndon White
26+
Markus Otto
27+
Maximilian Kindshofer
28+
Michael Lutonsky
29+
Michael Reichert
30+
Moritz Frenzel
31+
Morten Linderud
32+
Noah Kantrowitz
33+
Pepi Zawodsky
34+
Peter Körner
35+
Philippe Arteau
36+
Raphael Michel
37+
Raphaël Vinot
38+
Sasha Romijn
39+
Sebastian Gepperth
40+
Sebastian Reimers
41+
Stefan Krüger
42+
Stephan Druskat
43+
Stéphane Parunakian
44+
TabascoEye
45+
Thies Mueller
46+
Tobias Kunze
47+
Vlad Lyga
48+
Volker Mische

doc/_static/redoc.standalone.js

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

doc/_static/rest.js

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
const spec = "/schema.yml";
2+
Redoc.init(spec, {
3+
hideLoading: true,
4+
jsonSampleExpandLevel: 3,
5+
expandResponses: "200,201",
6+
}, document.querySelector("redoc"), () => {
7+
const toctree = document.querySelector('#toctree li.toctree-l2.current');
8+
if (!toctree) return;
9+
10+
const apiContent = document.querySelector('#redoc .api-content');
11+
if (!apiContent) return;
12+
13+
// Get all direct child divs and find ones with single-slash IDs (tag headings rather than endpoints)
14+
const tags = Array.from(apiContent.children)
15+
.filter(el => el.tagName === 'DIV' && el.id && (el.id.match(/\//g) || []).length === 1);
16+
if (tags.length === 0) return;
17+
18+
const ul = document.createElement('ul');
19+
tags.forEach(tag => {
20+
const h2 = tag.querySelector('h2');
21+
const title = h2 ? h2.textContent.trim() : tag.id;
22+
const li = document.createElement('li');
23+
li.className = 'toctree-l3';
24+
const a = document.createElement('a');
25+
a.className = 'reference internal';
26+
a.href = '#' + tag.id;
27+
a.textContent = title.replace(/-/g, ' ').charAt(0).toUpperCase() + title.replace(/-/g, ' ').slice(1);
28+
h2.textContent = a.textContent
29+
li.appendChild(a);
30+
ul.appendChild(li);
31+
});
32+
33+
// Insert the container after the current toctree item
34+
toctree.appendChild(ul);
35+
});

doc/_templates/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% extends "layout.html" %}
22
{% set title = "Overview" %}
33
{% block body %}
4+
<section>
45
<h1>Welcome to pretalx’s documentation</h1>
56
<p>
67
<p>pretalx is an open source conference management tool.
@@ -162,5 +163,6 @@ <h2>Useful links</h2>
162163
</div>
163164
</a>
164165
</div>
166+
</section>
165167

166168
{% endblock %}

doc/_themes/pretalx_theme/layout.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
<link rel="stylesheet" href="{{ pathto('_static/pretalx.css', 1) }}" type="text/css" />
2020
{% for cssfile in css_files %}
21-
<link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
21+
<link rel="stylesheet" href="{{ pathto(cssfile.filename, 1) }}" type="text/css" />
2222
{% endfor %}
2323
{% for cssfile in extra_css_files %}
24-
<link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
24+
<link rel="stylesheet" href="{{ pathto(cssfile.filename, 1) }}" type="text/css" />
2525
{% endfor %}
2626

2727
{%- block linktags %}
@@ -102,7 +102,7 @@
102102
};
103103
</script>
104104
{%- for scriptfile in script_files %}
105-
<script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
105+
<script type="text/javascript" src="{{ pathto(scriptfile.filename|default(scriptfile), 1) }}"></script>
106106
{%- endfor %}
107107

108108
{%- block footer %} {% endblock %}

doc/_themes/pretalx_theme/static/css/pretalx.css

Lines changed: 115 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
font-style: normal;
9393
}
9494
h1, h2, h3, h4, legend, .btn, button {
95-
font-family: "Titillium Web", "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif;
95+
font-family: var(--font-family-title);
9696
}
9797
.fa {
9898
font-family: inherit
@@ -108,13 +108,20 @@ h1, h2, h3, h4, legend, .btn, button {
108108

109109
/* Page layout */
110110

111+
:root {
112+
--text-color: rgba(0,0,0,0.87);
113+
--font-family-title: "Titillium Web", "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif;
114+
--font-family-text: "Muli", "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif;
115+
--font-family-code: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
116+
}
117+
111118
html {
112119
height: 100%;
113120
}
114121
body {
115-
font-family: "Muli", "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif;
122+
font-family: var(--font-family-text);
116123
font-weight: normal;
117-
color: rgba(0,0,0,0.87);
124+
color: var(--text-color);
118125
height: 100vh;
119126
display: flex;
120127
flex-direction: column;
@@ -271,9 +278,14 @@ footer a.fa {
271278
.nav-content {
272279
margin: 3.5em 6em;
273280
height: 100%;
274-
max-width: 800px;
275281
line-height: 1.5;
276282
}
283+
.nav-content section > * {
284+
max-width: 800px;
285+
}
286+
.nav-content section > section{
287+
max-width: 100%;
288+
}
277289

278290
/* Generic styles */
279291

@@ -310,7 +322,6 @@ mark {
310322
}
311323

312324
pre, code, tt, code, kbd, samp {
313-
font-family: monospace, serif;
314325
font-size: 1em
315326
}
316327

@@ -559,14 +570,14 @@ input:focus:invalid:focus, textarea:focus:invalid:focus, select:focus:invalid:fo
559570
border-color: #E74C3C
560571
}
561572

562-
code, tt, code {
573+
code, tt {
563574
white-space: nowrap;
564575
max-width: 100%;
565576
background: #fff;
566577
border: solid 1px #e1e4e5;
567578
font-size: 75%;
568579
padding: 0 5px;
569-
font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
580+
font-family: var(--font-family-code);
570581
color: #E74C3C;
571582
overflow-x: auto
572583
}
@@ -637,7 +648,7 @@ div[class^='highlight'] pre {
637648
white-space: pre;
638649
margin: 0;
639650
padding: 12px 12px;
640-
font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
651+
font-family: var(--font-family-code);
641652
font-size: 12px;
642653
line-height: 1.5;
643654
display: block;
@@ -1077,6 +1088,102 @@ dl.method > dt, dl.class > dt, dl.attribute > dt {
10771088
width: 100%;
10781089
}
10791090

1091+
/* API documentation styles */
1092+
redoc#redoc {
1093+
display: block;
1094+
max-width: calc(100% + 6em);
1095+
margin-left: -2.5em;
1096+
1097+
.menu-content,
1098+
.api-info,
1099+
.api-content + div,
1100+
.api-content > div:first-child,
1101+
h5 span + div { display: none }
1102+
1103+
div, button {
1104+
font-family: var(--font-family-text);
1105+
font-size: 16px;
1106+
}
1107+
h2, h3, h4, h5 {
1108+
font-family: var(--font-family-title);
1109+
color: var(--text-color);
1110+
}
1111+
h2 {
1112+
font-size: 28px;
1113+
text-transform: capitalize;
1114+
}
1115+
h3 {
1116+
font-size: 24px;
1117+
}
1118+
1119+
.api-content {
1120+
width: 100%;
1121+
}
1122+
.api-content > div[data-section-id] > div[data-section-id] > :nth-child(1) {
1123+
width: calc(50%);
1124+
}
1125+
.api-content > div[data-section-id] > div[data-section-id] > :nth-child(2) {
1126+
width: calc(50%);
1127+
background: none;
1128+
h3 {
1129+
color: var(--text-color);
1130+
}
1131+
}
1132+
.property-name, button .property-name {
1133+
font-size: 16px;
1134+
font-family: var(--font-family-code);
1135+
& + div {
1136+
padding-left: 2px;
1137+
font-size: 13px;
1138+
font-family: var(--font-family-code);
1139+
}
1140+
}
1141+
[role=tabpanel] {
1142+
& > div:first-child > div:first-child {
1143+
display: none;
1144+
& + div {
1145+
margin-top: 0;
1146+
}
1147+
}
1148+
}
1149+
table {
1150+
tr {
1151+
background-color: transparent;
1152+
}
1153+
td, th {
1154+
border-top: none;
1155+
border-right: none;
1156+
border-bottom: none;
1157+
}
1158+
tr > td:first-of-type {
1159+
padding-top: calc(1em - 4px);
1160+
}
1161+
tr > td:not(:first-of-type) {
1162+
border-left: none;
1163+
}
1164+
ul {
1165+
padding-left: 0;
1166+
}
1167+
li code, p > code {
1168+
/* enum lists */
1169+
color: var(--text-color);
1170+
}
1171+
}
1172+
.dEQDjv {
1173+
/* probably going to break any time now, but for now: fix the unbearably misaligned typesetting of faux code elements, e.g. "Item Enum: " fields */
1174+
padding: 5px 5px 0px 5px;
1175+
}
1176+
.react-tabs__tab-panel code {
1177+
background: none;
1178+
border: none;
1179+
color: white;
1180+
}
1181+
code, code span, code div {
1182+
font-size: 13px;
1183+
font-family: var(--font-family-code);
1184+
}
1185+
}
1186+
10801187
@media screen and (max-width: 768px) {
10811188
.tablet-hide {
10821189
display: none !important

0 commit comments

Comments
 (0)