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

Commit Graph

  • e67bc8dc5a Merge branch 'dsprenkels/unlimited_queue_length' into 'marietje-zuid' Daan Sprenkels 2020-06-16 10:38:35 +02:00
  • e5fe2aa1cf queues: Fix unlimited_queue codename in check Daan Sprenkels 2020-06-16 10:34:02 +02:00
  • 9529ae245a Add a more complete .gitignore file; NFC Daan Sprenkels 2020-06-16 10:14:08 +02:00
  • a325ebbe82 Merge branch 'dsprenkels/songs-reportnote-filter' into 'marietje-zuid' Daan Sprenkels 2020-06-15 18:08:26 +02:00
  • a422e6d4f5 Merge branch 'dsprenkels/admin-optimizations' into 'marietje-zuid' Daan Sprenkels 2020-06-15 17:54:33 +02:00
  • b4a6530204 admin: Use autocomplete for inline reportuser Daan Sprenkels 2020-06-15 17:52:20 +02:00
  • 1292694c4a Merge branch 'dsprenkels/admin-optimizations' into 'marietje-zuid' Daan Sprenkels 2020-06-15 17:39:28 +02:00
  • 64b26d03a1 admin: Use autocomplete for user field Daan Sprenkels 2020-06-15 17:34:20 +02:00
  • 2ade1a7dfa Merge branch 'marietje-zuid' into 'dsprenkels/songs-reportnote-filter' Daan Sprenkels 2020-06-15 17:13:52 +02:00
  • 1a797a5d98 Merge branch 'dsprenkels/notes-song-link' into 'marietje-zuid' Daan Sprenkels 2020-06-15 17:11:06 +02:00
  • b604ac9955 admin: reports: Hide song list Daan Sprenkels 2020-06-15 17:07:53 +02:00
  • bb6166c1db Merge branch 'notes-song-link' into 'marietje-zuid' Daan Sprenkels 2020-06-15 16:31:35 +02:00
  • 3aa876e223 Merge branch 'dsprenkels/freeze-pylint' into 'marietje-zuid' Daan Sprenkels 2020-06-15 16:27:50 +02:00
  • 61fa646353 ci: Freeze pylint version Daan Sprenkels 2020-06-15 16:19:58 +02:00
  • 416fb3e5a9 admin: songs: Add a filter on reportnote count Daan Sprenkels 2020-06-15 16:14:10 +02:00
  • 1b5b5106ba report-note: admin: Add a link to relevant song Daan Sprenkels 2020-06-15 15:18:37 +02:00
  • 4a1df11b40 Merge branch 'oslomp/issue_11' into 'marietje-zuid' Daan Sprenkels 2020-06-11 09:28:51 +02:00
  • f4ab85106d Merge branch 'unlimited_queue_length' into 'marietje-zuid' Olaf Slomp 2020-06-10 11:13:06 +02:00
  • 23f651bbd1 Fix pylint errors Daan Sprenkels 2020-06-09 17:57:25 +02:00
  • 3724b94e4a Add 'unlimited_queue_length' permission Daan Sprenkels 2020-06-09 17:36:12 +02:00
  • 4fdf25ac43 Merge branch 'marietje-zuid' into 'marietje-zuid' Gerdriaan Mulder 2020-03-28 16:19:43 +01:00
  • 83406ec0ab stats: show 'last updated' in full width on mobile Gerdriaan Mulder 2020-03-28 16:19:16 +01:00
  • e447a7c210 Merge branch 'marietje-zuid' into 'marietje-zuid' Gerdriaan Mulder 2020-03-28 15:59:06 +01:00
  • 91d3b0cf35 user-stats: fix layout, fixes #13 Gerdriaan Mulder 2020-03-28 15:54:26 +01:00
  • 228d0208f2 Merge branch 'marietje-zuid' into 'marietje-zuid' Gerdriaan Mulder 2020-03-28 15:46:47 +01:00
  • 62ba17ef67 stats: show equal height columns Gerdriaan Mulder 2020-03-28 15:43:02 +01:00
  • 6a549fbd7b Merge branch 'oslomp/quickfix_artists' into 'marietje-zuid' Olaf Slomp 2020-03-28 15:11:44 +01:00
  • 371334326b quickfix artist stat oslomp/quickfix_artists Olaf Slomp 2020-03-28 15:12:09 +01:00
  • 42a76004d2 quickfix artist stats oslomp/artists Olaf Slomp 2020-03-28 15:08:10 +01:00
  • 51c04de639 artist stats fix Olaf Slomp 2020-03-28 15:04:42 +01:00
  • 40e2245d39 Merge branch 'oslomp/artists' into 'marietje-zuid' Gerdriaan Mulder 2020-03-28 14:26:31 +01:00
  • c9ba37d291 Artist statistics Olaf Slomp 2020-03-28 14:26:31 +01:00
  • e287bae4fd Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into oslomp/artists Olaf Slomp 2020-03-28 14:21:55 +01:00
  • 6ec3d57a39 Merge branch 'marietje-zuid' into 'marietje-zuid' Gerdriaan Mulder 2020-03-28 14:09:16 +01:00
  • 59993aa1c0 Remove unused import ASCIIUsernameValidator Gerdriaan Mulder 2020-03-28 14:07:00 +01:00
  • a1116ca4cd Remove python2 compatibility library django.utils.six Gerdriaan Mulder 2020-03-28 14:01:13 +01:00
  • dd21a3c97d Fucking Pylint 2.0. Olaf Slomp 2020-03-28 13:26:43 +01:00
  • c65bdcabd8 Fucking Pylint. Olaf Slomp 2020-03-28 13:23:36 +01:00
  • 716c159648 even more indentation fixes. Olaf Slomp 2020-03-28 13:15:42 +01:00
  • cec537d70e more indentation fixes. Olaf Slomp 2020-03-28 13:11:18 +01:00
  • 078e45dbbe more textual fixes Olaf Slomp 2020-03-28 13:06:54 +01:00
  • f66e13883c textual fix Olaf Slomp 2020-03-28 13:02:48 +01:00
  • fbbc944e71 fixed indentation Olaf Slomp 2020-03-28 13:00:31 +01:00
  • a6cc389e0b mini fixes Olaf Slomp 2020-03-28 12:56:27 +01:00
  • 8b437310ab Added artist-specific stats Olaf Slomp 2020-03-28 12:53:26 +01:00
  • 95bd47c46a Bump django version Daan Sprenkels 2020-03-04 14:54:45 +01:00
  • af6031c3a5 Merge branch 'revert-7af71276' into 'marietje-zuid' Daan Sprenkels 2019-11-01 17:34:22 +01:00
  • a3f501273f Revert "Merge branch 'oslomp/search_field' into 'marietje-zuid'" Daan Sprenkels 2019-11-01 17:31:44 +01:00
  • 7af7127612 Merge branch 'oslomp/search_field' into 'marietje-zuid' Daan Sprenkels 2019-10-31 10:32:07 +01:00
  • 4c9a431f8a Merge both search-fields into one Olaf Slomp 2019-10-31 10:32:07 +01:00
  • 53d3c6e5c4 Closes #11 Olaf Slomp 2019-10-26 08:48:33 +02:00
  • 581e14f7ef Merge branch 'dsprenkels/issue_15' into 'marietje-zuid' Olaf Slomp 2019-10-25 19:35:59 +02:00
  • d0ed0a0a62 Set all cache TTLs to 2 days Daan Sprenkels 2019-10-25 19:28:52 +02:00
  • ce3bfb02d5 Merge branch 'cron' into 'marietje-zuid' Daan Sprenkels 2019-10-25 19:20:51 +02:00
  • 065f29fe55 gitlab-ci: Regenerate caches after apply patch Daan Sprenkels 2019-10-25 19:16:45 +02:00
  • 3bdac86bfb Merge branch 'new_stat' into 'marietje-zuid' Olaf Slomp 2019-10-23 21:03:43 +02:00
  • a864e8f535 Extra statistic: biggest fans Olaf Slomp 2019-10-23 20:13:12 +02:00
  • 48dd3bd0df Merge branch 'visual_changes' into 'marietje-zuid' Gerdriaan Mulder 2019-04-08 18:09:16 +02:00
  • 2fcd827b85 Visual changes Olaf Slomp 2019-04-08 18:09:14 +02:00
  • b9fa1747c4 searching ignores interpunction characters search oslomp 2019-04-03 17:53:06 +02:00
  • 1ca9080017 Merge branch 'bugfix' into 'marietje-zuid' Gerdriaan Mulder 2019-04-01 18:41:01 +02:00
  • 7aa9d6ab2a changed the way it fixes the bug oslomp 2019-04-01 18:37:22 +02:00
  • b4b0d224ce fix visible skip-button for non-mods oslomp 2019-04-01 10:57:48 +02:00
  • 1ec7d817fb Merge branch 'marietje-zuid' of ssh://gitlab.science.ru.nl/dsprenkels/MarietjeDjango into marietje-zuid Daan Sprenkels 2019-03-31 14:54:01 +02:00
  • 55960dff66 ci: Set --work-dir to MarietjeDjango repo Daan Sprenkels 2019-03-31 14:53:11 +02:00
  • 81ff76a2ef Merge branch 'dsprenkels/privacy' into 'marietje-zuid' Daan Sprenkels 2019-03-31 14:38:46 +02:00
  • 9f72e07a71 privacy: Update context around a15f922 changes Daan Sprenkels 2019-03-31 14:34:33 +02:00
  • a15f922d49 privacy: Do not delete name Daan Sprenkels 2019-03-29 17:43:54 +01:00
  • 9c40eb228e ci/deploy: Properly escape $'s Daan Sprenkels 2019-03-29 15:42:01 +01:00
  • 8bc3a288ee ci/deploy: Pull code instead of push Daan Sprenkels 2019-03-29 15:29:59 +01:00
  • 576ed475f1 ci/deploy: Install git and no pylint deps Daan Sprenkels 2019-03-29 15:11:50 +01:00
  • 639d57d221 ci: Fix .gitlab-ci.yml syntax Daan Sprenkels 2019-03-29 15:06:18 +01:00
  • 2dcd23a28c ci: Add deploy stage Daan Sprenkels 2019-03-29 15:01:26 +01:00
  • 1c47cfda7c Merge branch 'dsprenkels/button-nav-class' into 'marietje-zuid' Daan Sprenkels 2019-03-29 14:32:31 +01:00
  • 00b2609f17 interface: Align button nav with other content Daan Sprenkels 2019-03-29 14:29:24 +01:00
  • 810e071eb4 Revert "Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'"" Daan Sprenkels 2019-03-29 14:25:55 +01:00
  • b8aa4604fd Merge branch 'revert-e4fcdd74' into 'marietje-zuid' Gerdriaan Mulder 2019-03-28 19:06:57 +01:00
  • 102874cc86 Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'" Gerdriaan Mulder 2019-03-28 19:05:09 +01:00
  • e4fcdd7434 Merge branch 'marietje-zuid-interface' into 'marietje-zuid' Gerdriaan Mulder 2019-03-28 18:54:46 +01:00
  • d0c82f33df Updated interface - added a bar on the top which shows some info - moved mod buttons to the bar - added some information about your queue to the bar - merged the table for current song and full queue - some more small fixes Olaf Slomp 2019-03-28 18:54:46 +01:00
  • 568f7c6a50 Add missing migration Daan Sprenkels 2019-03-20 11:31:33 +01:00
  • bc3488557c Merge branch 'marietje-zuid' of marietje-zuid.science.ru.nl:/srv/MarietjeDjango into marietje-zuid Daan Sprenkels 2019-03-20 11:26:04 +01:00
  • 22a8c3bd4a Merge branch 'playlistsongs' into 'marietje-zuid' Daan Sprenkels 2019-03-20 11:24:22 +01:00
  • dff15663f4 Merge branch 'dsprenkels/remove_executed' into 'marietje-zuid' Daan Sprenkels 2019-03-20 11:22:57 +01:00
  • fc60135d6c Merge branch 'dsprenkels/remove_executed' of ssh://gitlab.science.ru.nl/dsprenkels/MarietjeDjango into dsprenkels/remove_executed Daan Sprenkels 2019-03-20 11:20:09 +01:00
  • 0f840c2470 Merge branch 'marietje-zuid' into dsprenkels/remove_executed Daan Sprenkels 2019-03-20 11:19:50 +01:00
  • 9b559cb3f2 Add production requirements.txt in a separate file Daan Sprenkels 2019-03-20 11:18:28 +01:00
  • bc9108a237 Revert "Update requirements.txt" Daan Sprenkels 2019-03-20 11:17:40 +01:00
  • 6d568851d3 Merge branch 'marietje-zuid' into 'dsprenkels/remove_executed' Daan Sprenkels 2019-03-20 11:15:03 +01:00
  • 58b96cb159 Revert "Update requirements.txt" Daan Sprenkels 2019-03-20 11:12:30 +01:00
  • 0b1dfaf020 Remove executed field from QueueCommand Daan Sprenkels 2019-03-20 10:56:44 +01:00
  • 6fed97f62c Remove executed field from QueueCommand Daan Sprenkels 2019-03-20 10:56:44 +01:00
  • 6ae7da5797 Update requirements.txt Daan Sprenkels 2019-03-20 10:32:55 +01:00
  • be083fecfd made song read-only oslomp 2019-03-06 04:04:54 +01:00
  • edbbabe657 Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid Gerdriaan Mulder 2019-03-05 19:38:08 +01:00
  • 94ebe3465c Merge branch 'fix/issue-2' into 'marietje-zuid' Gerdriaan Mulder 2019-03-05 19:37:37 +01:00
  • 2587ea0fb6 Correctly save PlaylistSong.played_at, fixes #2 Gerdriaan Mulder 2019-03-05 19:37:37 +01:00
  • 347c15d4b9 Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into marietje-zuid Gerdriaan Mulder 2019-03-05 18:30:02 +01:00
  • c7f6ee1e61 Merge branch 'revert-289e9375' into 'marietje-zuid' Gerdriaan Mulder 2019-03-05 18:28:02 +01:00
  • 83b0cdf790 Revert "Merge branch '14-day-stat' into 'marietje-zuid'" Gerdriaan Mulder 2019-03-05 18:09:45 +01:00