|
|
98a8332cb4
|
Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid
|
2019-02-28 16:27:51 +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 |
|
|
|
25769d40e0
|
small fixes
|
2019-02-15 22:58:21 +01:00 |
|
|
|
530c44affa
|
bugfixes stats
|
2019-02-15 22:19:55 +01:00 |
|
|
|
3c35fc6b6c
|
merging from rep in production
|
2019-02-15 17:41:40 +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 |
|
|
|
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 |
|
