Commit Graph

236 Commits

Author SHA1 Message Date
11e8ff11b8 Add logging for API endpoints 2023-11-25 07:38:28 +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
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
b604ac9955 admin: reports: Hide song list
In 1b5b510, the complete list of songs was re-added.  Loading this
list is super slow and should not happen.
2020-06-15 17:10:18 +02:00
416fb3e5a9 admin: songs: Add a filter on reportnote count
This filter allows the admin to list only the songs that have a
report note that needs to be resolved.
2020-06-15 16:14:10 +02:00
1b5b5106ba report-note: admin: Add a link to relevant song
Previously, the admin could not directly move from a report note to
its corresponding song. This commit adds a link that will go
directly to the "change" page for the corresponding song.
2020-06-15 15:18:37 +02:00
4a1df11b40 Merge branch 'oslomp/issue_11' into 'marietje-zuid'
api: Only allow POST requests on views.skip

Closes #11

See merge request dsprenkels/MarietjeDjango!41
2020-06-11 09:28:51 +02:00
f4ab85106d Merge branch 'unlimited_queue_length' into 'marietje-zuid'
Add 'unlimited_queue_length' permission

See merge request dsprenkels/MarietjeDjango!50
2020-06-10 11:13:06 +02:00
23f651bbd1 Fix pylint errors 2020-06-09 17:57:25 +02:00
3724b94e4a Add 'unlimited_queue_length' permission
The 'unlimited_queue_length' permission allows a user to queue
songs without being restricted by the 45-minute queue length.
2020-06-09 17:37:08 +02:00
83406ec0ab stats: show 'last updated' in full width on mobile 2020-03-28 16:19:16 +01:00
91d3b0cf35 user-stats: fix layout, fixes #13 2020-03-28 15:54:26 +01:00
62ba17ef67 stats: show equal height columns 2020-03-28 15:43:02 +01:00
371334326b quickfix artist stat 2020-03-28 15:12:09 +01:00
c9ba37d291 Artist statistics 2020-03-28 14:26:31 +01:00
59993aa1c0 Remove unused import ASCIIUsernameValidator 2020-03-28 14:07:00 +01:00
a1116ca4cd Remove python2 compatibility library django.utils.six 2020-03-28 14:01:13 +01:00
a3f501273f Revert "Merge branch 'oslomp/search_field' into 'marietje-zuid'"
This reverts merge request !42
2019-11-01 17:31:44 +01:00
4c9a431f8a Merge both search-fields into one 2019-10-31 10:32:07 +01:00