Daan Sprenkels
81ff76a2ef
Merge branch 'dsprenkels/privacy' into 'marietje-zuid'
...
Update privacy statement
See merge request dsprenkels/MarietjeDjango!33
2019-03-31 14:38:46 +02:00
Daan Sprenkels
1c47cfda7c
Merge branch 'dsprenkels/button-nav-class' into 'marietje-zuid'
...
Dsprenkels/button nav class
See merge request dsprenkels/MarietjeDjango!32
2019-03-29 14:32:31 +01:00
Daan Sprenkels
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
Daan Sprenkels
dff15663f4
Merge branch 'dsprenkels/remove_executed' into 'marietje-zuid'
...
Remove executed field from QueueCommand
This change was already added. But accidentally pushed to marietje-zuid. This commit fixes that buggy change.
See merge request dsprenkels/MarietjeDjango!29
2019-03-20 11:22:57 +01:00
Daan Sprenkels
6d568851d3
Merge branch 'marietje-zuid' into 'dsprenkels/remove_executed'
...
# Conflicts:
# marietje/playerapi/views.py
2019-03-20 11:15:03 +01:00
Daan Sprenkels
d214d8f72d
Merge branch 'dsprenkels/faster-report-admin' into 'marietje-zuid'
...
reports: Make songs readonly for performance
See merge request dsprenkels/MarietjeDjango!17
2019-01-30 13:57:53 +01:00
Daan Sprenkels
33e3266261
Merge branch 'dsprenkels/pylint' into 'marietje-zuid'
...
Run pylint as CI script
See merge request dsprenkels/MarietjeDjango!14
2019-01-17 11:10:09 +01:00
Daan Sprenkels
6153a09277
Merge branch 'marietje-zuid' into 'marietje-zuid'
...
Song reporting and user stats
See merge request dsprenkels/MarietjeDjango!5
2018-12-14 16:59:45 +01:00
Daan Sprenkels
c160ab12ce
Merge branch 'marietje-zuid' into 'marietje-zuid'
...
queue/request: include length in request list
See merge request dsprenkels/MarietjeDjango!1
2018-11-23 15:31:41 +01:00
Daan Sprenkels
6ec09cc5d4
importsongs: fix typo
2018-02-05 20:15:47 +01:00
Daan Sprenkels
8435291bcd
importusers: do not add md5 hash prefix
2018-02-05 20:09:05 +01:00
Daan Sprenkels
255cf33d85
importsongs: decode hash,old_id to ascii
2018-02-05 20:04:35 +01:00
Daan Sprenkels