technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-10 03:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 0554b6e059 Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid Gerdriaan Mulder 2019-03-05 18:04:55 +01:00
  • 289e93755b Merge branch '14-day-stat' into 'marietje-zuid' Gerdriaan Mulder 2019-03-05 18:04:39 +01:00
  • d8c7f82c94 Fixed the 14-days stat being broken. oslomp 2019-03-01 21:19:26 +01:00
  • a67ca0ba9a Merge branch 'admin-fix' into 'marietje-zuid' Gerdriaan Mulder 2019-03-01 21:34:39 +01:00
  • 88f709f34c Admin fix Olaf Slomp 2019-03-01 21:34:39 +01:00
  • 7f100ac1df broken admin-search fixed oslomp 2019-03-01 19:57:33 +01:00
  • 903cea3033 Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid oslomp 2019-02-28 17:31:01 +01:00
  • 65a77079a7 Merge branch 'percentages' into 'marietje-zuid' Gerdriaan Mulder 2019-02-28 17:22:40 +01:00
  • 2d721bf51a Percentages Olaf Slomp 2019-02-28 17:22:40 +01:00
  • 98a8332cb4 Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid oslomp 2019-02-28 16:27:51 +01:00
  • 0f6a69626b Merge branch 'oslomp/stats_bugfixes' into 'marietje-zuid' Gerdriaan Mulder 2019-02-28 10:45:01 +01:00
  • 3f263ae429 Oslomp/stats bugfixes Olaf Slomp 2019-02-28 10:45:01 +01:00
  • 25769d40e0 small fixes oslomp 2019-02-15 22:58:21 +01:00
  • 530c44affa bugfixes stats oslomp 2019-02-15 22:19:55 +01:00
  • 3c35fc6b6c merging from rep in production oslomp 2019-02-15 17:41:40 +01:00
  • 409c5b2930 Merge branch 'oslomp/MarietjeDjango-improved_stats' into 'marietje-zuid' Gerdriaan Mulder 2019-02-15 17:04:13 +01:00
  • 6dc36f2092 pylint fixes oslomp 2019-02-04 19:53:20 +01:00
  • 1b4108c5d0 fix indentations oslomp 2019-01-30 16:47:43 +01:00
  • add542a5c4 fix merge conflicts oslomp 2019-01-30 15:55:10 +01:00
  • d214d8f72d Merge branch 'dsprenkels/faster-report-admin' into 'marietje-zuid' Daan Sprenkels 2019-01-30 13:57:53 +01:00
  • 4ac3d6e425 reports: Make songs readonly for performance Daan Sprenkels 2019-01-30 13:19:46 +01:00
  • 3c080ced24 Fix bug introduced by 19c1c70 Daan Sprenkels 2019-01-30 13:37:59 +01:00
  • 19c1c70cd3 fix all pylint complaints Daan Sprenkels 2019-01-21 22:26:43 +01:00
  • 2c41e85753 ci: Make pylint modules more explicit Daan Sprenkels 2019-01-20 22:36:19 +01:00
  • 14bfa8a9a0 ci: Install django Daan Sprenkels 2019-01-20 22:31:34 +01:00
  • a40a5c7593 Merge branch 'marietje-zuid' of ssh://gitlab.science.ru.nl/dsprenkels/MarietjeDjango into marietje-zuid Daan Sprenkels 2019-01-20 22:28:45 +01:00
  • f10a4759da Move issues/MRs urls to dsprenkels Daan Sprenkels 2019-01-20 22:27:03 +01:00
  • 33e3266261 Merge branch 'dsprenkels/pylint' into 'marietje-zuid' Daan Sprenkels 2019-01-17 11:10:09 +01:00
  • 42a631641e Add pylint stub Daan Sprenkels 2019-01-16 19:28:50 +01:00
  • 12ad8135bd fix query not being listed oslomp 2019-01-16 21:49:55 +01:00
  • 969abd29cb Merge branch 'oslomp/MarietjeDjango-queue' into marietje-zuid Daan Sprenkels 2019-01-16 19:10:55 +01:00
  • 585485b130 Visually separate regular and Marietje's queue oslomp 2019-01-11 13:11:25 +01:00
  • 00d0a32ece general clean-up oslomp 2019-01-10 21:01:15 +01:00
  • 1cf4378316 added descriptions to stats and userstats oslomp 2019-01-10 20:56:37 +01:00
  • 274949c519 added average song length to stats oslomp 2019-01-10 20:53:11 +01:00
  • 6a86cf1c0a split uploads in 2 columns oslomp 2019-01-10 20:51:54 +01:00
  • 264ec991e5 changed Most played uploads to exclude your requests, and some small fixes oslomp 2019-01-10 20:48:52 +01:00
  • e719771d1c added cache to settings file oslomp 2019-01-10 20:36:24 +01:00
  • a2937bad71 added usercache oslomp 2019-01-10 20:34:36 +01:00
  • e7ef899bb3 Improving alert box Fixed error with the cancel button and upgraded the returned messages oslomp 2019-01-10 19:04:37 +01:00
  • 31efdd97f4 Marietje-queue changes oslomp 2018-12-21 12:44:17 +01:00
  • 3319732775 fix allignment oslomp 2018-12-19 00:48:40 +01:00
  • b6a0f25d19 completely fixed the arrows oslomp 2018-12-19 00:39:21 +01:00
  • a000774e0b delete move_up and switch_order functions oslomp 2018-12-18 19:21:05 +01:00
  • fb111f8be5 dont ignore settings.py oslomp 2018-12-18 19:10:48 +01:00
  • ede54c94d2 Merge branch 'marietje-zuid' of gitlab.science.ru.nl:oslomp/MarietjeDjango into marietje-zuid oslomp 2018-12-18 19:04:08 +01:00
  • afb0886fca Added explanation to stats and changed some details oslomp 2018-12-18 18:53:49 +01:00
  • fe5a4b9119 fixing arrows homescreen oslomp 2018-12-17 19:59:36 +01:00
  • 6cf1b4bef2 Fixes on arrows in the main screen oslomp 2018-12-16 21:39:11 +01:00
  • 6adbecec9c Added average duration to Time Requested in stats oslomp 2018-12-15 16:43:15 +01:00
  • 2e9be85cc4 Split Uploads Requested in two columns, for others and for you personally oslomp 2018-12-15 15:19:47 +01:00
  • 1da2f4cc05 Changed alert messages for successfull or failed reports oslomp 2018-12-15 14:14:24 +01:00
  • 027ee6b3e5 I need to find out how to do this efficiently. Olaf Slomp 2018-12-15 01:45:35 +01:00
  • aff8ddf878 Small fixes in stats and userstats, changed Most_played_uploads to exclude your own plays oslomp 2018-12-15 01:42:52 +01:00
  • ce73e5d874 Fix unique requests stats ordering oslomp 2018-12-14 23:47:55 +01:00
  • ea308d5071 Merge branch 'marietje-zuid' of gitlab.science.ru.nl:oslomp/MarietjeDjango into marietje-zuid oslomp 2018-12-14 23:32:32 +01:00
  • 29bd66c881 updated settings for cashing userstats Olaf Slomp 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 }, }, oslomp 2018-12-14 23:23:46 +01:00
  • d99f12491c Merge branch 'master' into 'marietje-zuid' Olaf Slomp 2018-12-14 23:03:42 +01:00
  • dcfcd63db1 untrack settings oslomp 2018-12-14 22:56:26 +01:00
  • d1bf9a1b90 privacy: Update (song report note) Daan Sprenkels 2018-12-14 17:47:25 +01:00
  • 07d5cb82eb Fix request error feedback Daan Sprenkels 2018-12-14 17:43:50 +01:00
  • ce89125ade Expand 'default' cache size Daan Sprenkels 2018-12-14 17:37:29 +01:00
  • 298c89fc4d Limit user stat list size Daan Sprenkels 2018-12-14 17:29:50 +01:00
  • 6153a09277 Merge branch 'marietje-zuid' into 'marietje-zuid' Daan Sprenkels 2018-12-14 16:59:45 +01:00
  • f6fcc63450 Song reporting and user stats Olaf Slomp 2018-12-14 16:59:44 +01:00
  • 0c1f9cb08d Merge branch 'oslomp/duration-stats' into 'marietje-zuid' Olaf Slomp 2018-11-28 19:23:33 +01:00
  • 88ff6ee997 Redo "added Time Requested to stats" Daan Sprenkels 2018-11-28 12:29:20 +01:00
  • d827ec39d2 Revert "added Time Requested to stats" Daan Sprenkels 2018-11-28 12:28:19 +01:00
  • 38feb0d39e added Time Requested to stats oslomp 2018-11-28 11:35:44 +01:00
  • c1889954d7 Forget cancelled songs instead of state=(*) Daan Sprenkels 2018-11-23 16:32:18 +01:00
  • 84bf2653c2 Add choices on Song.state Daan Sprenkels 2018-11-23 16:26:21 +01:00
  • ecd5537eaf Align MM:SS to the right Daan Sprenkels 2018-11-23 16:09:51 +01:00
  • 08031fc225 Align MM:SS to the right Daan Sprenkels 2018-11-23 15:58:42 +01:00
  • 36a344ab07 Change time display to (H:)?MM:SS Daan Sprenkels 2018-11-23 15:50:49 +01:00
  • c160ab12ce Merge branch 'marietje-zuid' into 'marietje-zuid' Daan Sprenkels 2018-11-23 15:31:41 +01:00
  • 2a2316fb40 Try to fix autoqueue adoption #2 Daan Sprenkels 2018-11-23 15:28:54 +01:00
  • daf842ec62 Try to fix autoqueue adoption Daan Sprenkels 2018-11-23 15:24:39 +01:00
  • a692106c5b Disallow duplicate queues Daan Sprenkels 2018-11-23 15:17:29 +01:00
  • 66ca91f128 queue/request: include length in request list Gerdriaan Mulder 2018-11-23 14:45:36 +01:00
  • 6b8fdbab2e Do not allow staff modify song hash Daan Sprenkels 2018-11-23 14:41:27 +01:00
  • 78a66f7494 Show toolbar admin if is_staff Daan Sprenkels 2018-11-23 14:19:52 +01:00
  • 446b564a4b Fix upload bug (astimezone) Daan Sprenkels 2018-11-08 11:51:41 +01:00
  • 5c495b17ef Fix timezone and change upload limit to (2*) Daan Sprenkels 2018-11-08 11:13:50 +01:00
  • b2fa50c5a4 Fix spelling of queueën Daan Sprenkels 2018-11-02 18:49:05 +01:00
  • bac45e8b3d Set a str() for QueueCommand Daan Sprenkels 2018-10-28 17:28:13 +01:00
  • f1e6fef2d2 Add an index on User.name Daan Sprenkels 2018-10-28 17:23:10 +01:00
  • 3a4f9a336f Do not include html in upload ratio error Daan Sprenkels 2018-10-28 15:15:29 +01:00
  • e97a0c9711 Fix upload ratio TypeError Daan Sprenkels 2018-10-28 15:07:55 +01:00
  • 6771fd1347 Do not count irregular requests for upload ratio Daan Sprenkels 2018-10-28 15:02:55 +01:00
  • 383f12235a Add a db_index on PlaylistSong.user Daan Sprenkels 2018-10-28 14:26:58 +01:00
  • 21522602bd Add indices on search fields Daan Sprenkels 2018-10-26 16:36:46 +02:00
  • 6f4469d77a privacy: Add <p>'s Daan Sprenkels 2018-10-18 17:50:47 +02:00
  • cdc32f994c Remove extranous full stop Daan Sprenkels 2018-10-18 17:46:50 +02:00
  • fadf0da61e Some formatting Daan Sprenkels 2018-10-18 17:45:38 +02:00
  • 8acd36a8b7 Fix a typo Daan Sprenkels 2018-10-18 17:37:32 +02:00
  • bb13340028 Only show relevant stuff to internal clients Daan Sprenkels 2018-10-18 17:35:47 +02:00
  • ae7f087cdc Add privacy statement Daan Sprenkels 2018-10-18 17:05:32 +02:00
  • 16e3161b3f Fix replaygain analysis bug Daan Sprenkels 2018-10-12 19:19:11 +02:00
  • 844a198dcd Update queues admin interface Daan Sprenkels 2018-10-10 18:31:42 +02:00