Commit Graph

187 Commits

Author SHA1 Message Date
2d721bf51a Percentages 2019-02-28 17:22:40 +01:00
0f6a69626b Merge branch 'oslomp/stats_bugfixes' into 'marietje-zuid'
Oslomp/stats bugfixes

See merge request dsprenkels/MarietjeDjango!21
2019-02-28 10:45:01 +01:00
3f263ae429 Oslomp/stats bugfixes 2019-02-28 10:45:01 +01:00
409c5b2930 Merge branch 'oslomp/MarietjeDjango-improved_stats' into 'marietje-zuid'
Oslomp/marietje django improved stats

See merge request dsprenkels/MarietjeDjango!20
2019-02-15 17:04:13 +01:00
6dc36f2092 pylint fixes 2019-02-04 19:53:20 +01:00
1b4108c5d0 fix indentations 2019-01-30 16:47:43 +01:00
add542a5c4 fix merge conflicts 2019-01-30 15:55:10 +01:00
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
4ac3d6e425 reports: Make songs readonly for performance 2019-01-30 13:43:05 +01:00
3c080ced24 Fix bug introduced by 19c1c70 2019-01-30 13:38:35 +01:00
19c1c70cd3 fix all pylint complaints 2019-01-23 19:44:38 +01:00
2c41e85753 ci: Make pylint modules more explicit 2019-01-20 22:36:19 +01:00
14bfa8a9a0 ci: Install django 2019-01-20 22:31:34 +01:00
a40a5c7593 Merge branch 'marietje-zuid' of ssh://gitlab.science.ru.nl/dsprenkels/MarietjeDjango into marietje-zuid 2019-01-20 22:28:45 +01:00
f10a4759da Move issues/MRs urls to dsprenkels
Fixes #1
2019-01-20 22:27:03 +01:00
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
42a631641e Add pylint stub 2019-01-17 11:03:00 +01:00
12ad8135bd fix query not being listed 2019-01-16 21:49:55 +01:00
969abd29cb Merge branch 'oslomp/MarietjeDjango-queue' into marietje-zuid 2019-01-16 19:10:55 +01:00
585485b130 Visually separate regular and Marietje's queue
Original commit message:
Arrows and marietje part of queue updates
2019-01-16 17:58:58 +01:00
00d0a32ece general clean-up 2019-01-10 21:01:15 +01:00
1cf4378316 added descriptions to stats and userstats 2019-01-10 20:56:37 +01:00
274949c519 added average song length to stats 2019-01-10 20:53:11 +01:00
6a86cf1c0a split uploads in 2 columns 2019-01-10 20:51:54 +01:00
264ec991e5 changed Most played uploads to exclude your requests, and some small fixes 2019-01-10 20:48:52 +01:00
e719771d1c added cache to settings file 2019-01-10 20:36:24 +01:00
a2937bad71 added usercache 2019-01-10 20:34:36 +01:00
e7ef899bb3 Improving alert box
Fixed error with the cancel button and upgraded the returned messages
2019-01-10 20:15:56 +01:00
d1bf9a1b90 privacy: Update (song report note) 2018-12-14 17:47:25 +01:00
07d5cb82eb Fix request error feedback 2018-12-14 17:43:50 +01:00
ce89125ade Expand 'default' cache size 2018-12-14 17:37:29 +01:00
298c89fc4d Limit user stat list size 2018-12-14 17:29:50 +01:00
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
f6fcc63450 Song reporting and user stats 2018-12-14 16:59:44 +01:00
0c1f9cb08d Merge branch 'oslomp/duration-stats' into 'marietje-zuid'
Redo "added Time Requested to stats"

See merge request dsprenkels/MarietjeDjango!2
2018-11-28 19:23:33 +01:00
88ff6ee997 Redo "added Time Requested to stats"
This reverts commit d827ec39d2.
2018-11-28 12:29:20 +01:00
d827ec39d2 Revert "added Time Requested to stats"
This reverts commit 38feb0d39e.
2018-11-28 12:28:19 +01:00
38feb0d39e added Time Requested to stats 2018-11-28 11:35:44 +01:00
c1889954d7 Forget cancelled songs instead of state=(*) 2018-11-23 16:32:18 +01:00
84bf2653c2 Add choices on Song.state 2018-11-23 16:26:21 +01:00
ecd5537eaf Align MM:SS to the right 2018-11-23 16:09:51 +01:00
08031fc225 Align MM:SS to the right 2018-11-23 15:58:42 +01:00
36a344ab07 Change time display to (H:)?MM:SS 2018-11-23 15:50:49 +01:00
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
2a2316fb40 Try to fix autoqueue adoption #2 2018-11-23 15:28:54 +01:00
daf842ec62 Try to fix autoqueue adoption 2018-11-23 15:24:39 +01:00
a692106c5b Disallow duplicate queues 2018-11-23 15:17:29 +01:00
66ca91f128 queue/request: include length in request list 2018-11-23 14:45:36 +01:00
6b8fdbab2e Do not allow staff modify song hash 2018-11-23 14:41:27 +01:00
78a66f7494 Show toolbar admin if is_staff 2018-11-23 14:19:52 +01:00