Commit Graph

252 Commits

Author SHA1 Message Date
0e5fb7acd7 fix(queues): remove faulty update, add null-coalescing on song user
Removal of update call might resolve #66, but I hope I do not negate
@tjibbegottmer's work.
2024-02-27 23:20:23 +01:00
749546867a fix: set SameSite=Lax on cookies
Prevents Firefox warning.
2024-02-27 23:20:23 +01:00
521c047225 Auto-select search field in request tab 2024-02-27 22:37:35 +01:00
e45940772f Fix streepje from issue #48 2024-02-27 13:04:01 +01:00
13448a2eec Merge branch 'fix/remember-song-details-unfold' into 'marietje-zuid'
Keep song details unfolded between refreshes

Closes #79

See merge request technicie/MarietjeDjango!86
2024-02-27 20:56:24 +01:00
77728c9a82 Replace shift shit with array filter
Co-Authored-By: Olaf Slomp <git@oslomp.nl>
2024-02-27 12:48:52 +01:00
08cd59ce09 Store plays at/in in cookie
Closes #73
2024-02-27 12:16:38 +01:00
ad94fe7930 Keep song details unfolded between refreshes
Closes #79
2024-02-27 12:11:43 +01:00
5acf553269 feat(queue): re-add song details on mobile view
Closes #62
2024-02-21 15:50:20 +01:00
4768271aee Marietje in header and fix load times for upload page 2024-02-21 15:40:41 +01:00
2dd4dd3381 Merge branch 'fix/request-table' into 'marietje-zuid'
Other container layout and responsive queue container

Closes #47

See merge request technicie/MarietjeDjango!67
2024-02-21 12:28:25 +01:00
219af8fa1d Merge branch 'wkuijltjes/aesthetic-changes' into 'marietje-zuid'
Some aesthetic changes to the dark mode colors and the table borders

See merge request technicie/MarietjeDjango!81
2023-11-25 07:45:46 +01:00
98e43aa688 Some aesthetic changes to the dark mode colors and the table borders 2023-11-25 07:45:46 +01:00
831f479eec Merge branch 'wkuijltjes/minor-edits-stats-pages' into 'marietje-zuid'
Slightly improve stats pages

Closes #69

See merge request technicie/MarietjeDjango!80
2023-11-25 07:45:01 +01:00
6a9c22b7f8 Slightly improve stats pages 2023-11-25 07:45:01 +01:00
fbafcf1b06 Reduce the width of buttons in the control column and recombine them into one row 2023-11-25 07:44:45 +01:00
222ff7598a Replace a with button 2023-10-14 08:51:27 +02:00
f4f6cd6eed Preventing the line breaking of some of the "# Requests" columns in the stats pages 2023-10-13 13:08:29 +02:00
f516a31476 Merge branch 'fix/personal-queue-stats' into 'marietje-zuid'
Reimplement personal queue length overview

Closes #52

See merge request technicie/MarietjeDjango!75
2023-10-13 08:58:37 +02:00
72a6e65e98 Update settings layout for uWSGI 2023-10-13 08:47:45 +02:00
16e99ea320 Merge branch 'fix/manage-page-shows-all-songs' into 'marietje-zuid'
Show only songs that match the user on manage page

Closes #45

See merge request technicie/MarietjeDjango!66
2023-10-12 18:14:03 +02:00
107d5053d3 Show only songs that match the user on manage page 2023-10-12 18:14:03 +02:00
0672555d75 Reimplement personal queue length overview
Closes #52

The functionality was partially removed in !62.
2023-10-12 15:43:01 +02:00
41b128e2d8 Changing a single lowercase letter to uppercase 2023-10-11 17:28:48 +02:00
f69d0f1377 Merge branch 'fix/beeldscherm-marietje-null' into 'marietje-zuid'
Fix beeldscherm by resolving null to marietje

See merge request technicie/MarietjeDjango!73
2023-10-11 17:22:04 +02:00
04bf9532e4 Fix beeldscherm by resolving null to marietje 2023-10-11 17:22:04 +02:00
a78098198f Add announcements app 2023-10-11 16:49:37 +02:00
5c0480853a Merge branch 'fix/forgot-password-page' into 'marietje-zuid'
Fix bug for Forgot Password page

Closes #54

See merge request technicie/MarietjeDjango!70
2023-10-11 16:17:47 +02:00
41f33f5d20 Merge branch 'feature/save-amount-shown-per-page' into 'marietje-zuid'
Store page size on manage and request pages

Closes #51

See merge request technicie/MarietjeDjango!68
2023-10-11 16:09:30 +02:00
a9e0614b2c Merge branch 'feature/development-settings' into 'marietje-zuid'
Split production and development settings

Closes #34

See merge request technicie/MarietjeDjango!64
2023-10-11 16:02:25 +02:00
4c10d2308c Split production and development settings 2023-10-11 16:02:25 +02:00
63cc1a8fe0 Sort tracks based on artist, then on title 2023-10-11 15:26:00 +02:00
d8fa14e377 Fix bug for Forgot Password page 2023-10-06 20:49:18 +02:00
7a1b0583a6 Store page size on manage and request pages 2023-10-04 20:41:00 +02:00
8a926f3924 Other container layout and responsive queue container 2023-10-04 20:31:49 +02:00
c061d1c304 Fix scroll bug and add success/error messages 2023-10-04 20:21:43 +02:00
12e47ce6c2 Merge branch 'wkuijltjes-fixURLs' into 'marietje-zuid'
Update some URLs that no longer worked

See merge request technicie/MarietjeDjango!63
2023-09-26 09:53:27 +02:00
09c6c35bb7 Include uWSGI for production use, update pyproject.toml 2023-09-20 16:31:51 +02:00
d1a1be7e2e Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap 2023-09-14 19:55:51 +02:00
ed85dcac9a Removed a backslash that wasn't used before so just for autism's sake (and consistency) 2023-05-25 10:10:14 +02:00
c18d5d5f7b Changed the Issues (and Merge Requests) URL, since these directed to the old location of the repo, at the personal GitLab account of a Marietje admin. The new location (the Technicie Git) should work until further notice. 2023-05-25 10:06:24 +02:00
afee3630fa Merge branch 'implement-beeldscherm' into 'marietje-zuid'
Implement beeldscherm

Closes #20

See merge request technicie/MarietjeDjango!59
2022-10-28 08:46:10 +02:00
452147ae87 Add new extra URL for marietje-zuid 2022-10-26 10:27:54 +02:00
4491fc234b Add beeldscherm
Closes #20

Co-authored-by: Gerdriaan Mulder <mrngm@moeilijklastig.nl>
2022-07-06 13:46:15 +02:00
e67bc8dc5a Merge branch 'dsprenkels/unlimited_queue_length' into 'marietje-zuid'
queues: Fix unlimited_queue codename in check

See merge request dsprenkels/MarietjeDjango!57
2020-06-16 10:38:35 +02:00
e5fe2aa1cf queues: Fix unlimited_queue codename in check 2020-06-16 10:34:02 +02:00
a325ebbe82 Merge branch 'dsprenkels/songs-reportnote-filter' into 'marietje-zuid'
Add a filter on reportnote count in the Songs admin list

See merge request dsprenkels/MarietjeDjango!52
2020-06-15 18:08:26 +02:00
b4a6530204 admin: Use autocomplete for inline reportuser 2020-06-15 17:52:20 +02:00
64b26d03a1 admin: Use autocomplete for user field
Before this patch, we used the default setting, which emits a HTML
<select> tag containing a list of *all* the users.  We currently
have enough users that we do not want to load that complete list
every time.  So now, use the autocomplete field instead.
2020-06-15 17:34:20 +02:00
2ade1a7dfa Merge branch 'marietje-zuid' into 'dsprenkels/songs-reportnote-filter'
# Conflicts:
#   marietje/songs/admin.py
2020-06-15 17:13:52 +02:00