Commit Graph

239 Commits

Author SHA1 Message Date
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
31efdd97f4 Marietje-queue changes 2018-12-21 12:44:17 +01:00
3319732775 fix allignment 2018-12-19 00:48:40 +01:00
b6a0f25d19 completely fixed the arrows 2018-12-19 00:39:21 +01:00
a000774e0b delete move_up and switch_order functions 2018-12-18 19:21:05 +01:00
fb111f8be5 dont ignore settings.py 2018-12-18 19:10:48 +01:00
ede54c94d2 Merge branch 'marietje-zuid' of gitlab.science.ru.nl:oslomp/MarietjeDjango into marietje-zuid 2018-12-18 19:04:08 +01:00
afb0886fca Added explanation to stats and changed some details 2018-12-18 18:53:49 +01:00
fe5a4b9119 fixing arrows homescreen 2018-12-17 19:59:36 +01:00
6cf1b4bef2 Fixes on arrows in the main screen 2018-12-16 21:39:11 +01:00
6adbecec9c Added average duration to Time Requested in stats 2018-12-15 16:43:15 +01:00
2e9be85cc4 Split Uploads Requested in two columns, for others and for you personally 2018-12-15 15:19:47 +01:00
1da2f4cc05 Changed alert messages for successfull or failed reports 2018-12-15 14:14:24 +01:00
027ee6b3e5 I need to find out how to do this efficiently. 2018-12-15 01:45:35 +01:00
aff8ddf878 Small fixes in stats and userstats, changed Most_played_uploads to exclude your own plays 2018-12-15 01:42:52 +01:00
ce73e5d874 Fix unique requests stats ordering 2018-12-14 23:47:55 +01:00
ea308d5071 Merge branch 'marietje-zuid' of gitlab.science.ru.nl:oslomp/MarietjeDjango into marietje-zuid 2018-12-14 23:32:32 +01:00
29bd66c881 updated settings for cashing userstats 2018-12-14 23:28:50 +01:00
0140119828 Changed cache location for userstats.
Settings needs to be added:
    'userstats': {
        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
        'LOCATION': '/var/tmp/MarietjeDjango_cache/default',
        'OPTIONS': { 'MAX_ENTRIES': 1500 },
    },
2018-12-14 23:23:46 +01:00
d99f12491c Merge branch 'master' into 'marietje-zuid'
untrack settings

See merge request oslomp/MarietjeDjango!2
2018-12-14 23:03:42 +01:00
dcfcd63db1 untrack settings 2018-12-14 22:56:26 +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