Commit Graph

212 Commits

Author SHA1 Message Date
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
53d3c6e5c4 Closes #11 2019-10-26 08:48:33 +02:00
d0ed0a0a62 Set all cache TTLs to 2 days
Fixes #15.
2019-10-25 19:33:12 +02:00
a864e8f535 Extra statistic: biggest fans 2019-10-23 20:13:12 +02:00
2fcd827b85 Visual changes 2019-04-08 18:09:14 +02:00
7aa9d6ab2a changed the way it fixes the bug 2019-04-01 18:37:22 +02:00
b4b0d224ce fix visible skip-button for non-mods 2019-04-01 10:57:48 +02:00
9f72e07a71 privacy: Update context around a15f922 changes
Was decided 29/03 by Daan, Gerdriaan, Olaf.
2019-03-31 14:36:57 +02:00
a15f922d49 privacy: Do not delete name 2019-03-29 17:43:54 +01:00
00b2609f17 interface: Align button nav with other content 2019-03-29 14:29:24 +01:00
810e071eb4 Revert "Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'""
This reverts commit 102874cc86.
2019-03-29 14:25:55 +01:00
102874cc86 Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'"
This reverts merge request !30
2019-03-28 19:05:09 +01:00
d0c82f33df Updated interface
- added a bar on the top which shows some info
- moved mod buttons to the bar
- added some information about your queue to the bar
- merged the table for current song and full queue
- some more small fixes
2019-03-28 18:54:46 +01:00
568f7c6a50 Add missing migration 2019-03-20 11:31:33 +01:00
22a8c3bd4a Merge branch 'playlistsongs' into 'marietje-zuid'
Make song read-only in admin/playlistsong

See merge request dsprenkels/MarietjeDjango!27
2019-03-20 11:24:22 +01:00
0b1dfaf020 Remove executed field from QueueCommand 2019-03-20 11:09:06 +01:00
be083fecfd made song read-only 2019-03-06 04:04:54 +01:00
2587ea0fb6 Correctly save PlaylistSong.played_at, fixes #2 2019-03-05 19:37:37 +01:00
83b0cdf790 Revert "Merge branch '14-day-stat' into 'marietje-zuid'"
This reverts merge request !24
2019-03-05 18:09:45 +01:00
289e93755b Merge branch '14-day-stat' into 'marietje-zuid'
Fixed the 14-days stat being broken.

See merge request dsprenkels/MarietjeDjango!24
2019-03-05 18:04:39 +01:00
d8c7f82c94 Fixed the 14-days stat being broken. 2019-03-01 23:50:53 +01:00
88f709f34c Admin fix 2019-03-01 21:34:39 +01:00
2d721bf51a Percentages 2019-02-28 17:22:40 +01:00
3f263ae429 Oslomp/stats bugfixes 2019-02-28 10:45:01 +01:00
6dc36f2092 pylint fixes 2019-02-04 19:53:20 +01:00