technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2026-09-27 10:50:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
387 Commits 11 Branches 0 Tags
8f698315dcf57596706aaaa415d23927b16f67dd
Commit Graph
91 Commits
Author SHA1 Message Date
Daniël Visser 4bc3f38f69 Merge branch 'marietje-zuid' into 'feature/improve-queueable' 
# Conflicts:
#   marietje/queues/templates/queues/queue.html
 2024-09-10 17:19:12 +02:00
Tjibbe 6d545dddcc feat: grey-out already queued songs and make unclickable 2024-05-06 13:55:19 +02:00
kees b5aa079254 Merge branch 'wkuijltjes/playsinat' into 'marietje-zuid' 
Fix toggling of Plays In/Plays At in mobile view

Closes #86

See merge request technicie/MarietjeDjango!93
 2024-04-23 18:19:39 +02:00
kees 7ab6bc6c78 fix(queues): remove redundant and faulty toggle_details call 
song is not even defined in this scope.
 2024-04-23 18:11:59 +02:00
kees 3c2df2adfd styling(queues): move no underline to css 2024-04-23 17:56:58 +02:00
kees 82dc7c0193 Merge branch 'wkuijltjes/fixtimer' into 'marietje-zuid' 
Fix dynamic times that should be static and vice versa if logged in user has queued

Closes #66

See merge request technicie/MarietjeDjango!94
 2024-04-23 17:44:22 +02:00
William Kuijltjes 0f85727c5d Brush up some details: reduce breakpoints on small screens, Requested by --> Requested By 2024-03-18 18:02:25 +01:00
William Kuijltjes 2b2e0a0275 Fix dynamic times that should be static and vice versa if logged in user has queued 2024-03-18 16:51:34 +01:00
William Kuijltjes 311e13f696 Fix toggling of Plays In/Plays At in mobile view 2024-03-18 12:45:15 +01:00
William Kuijltjes d004ff81ac Left-align long song titles in the request tab with a lot of tender loving care from Kees xx 2024-03-05 11:59:28 +01:00
kees 669e1e3b18 fix(queues): now really fix the request notifications 
Instead of checking for success, now the correct HTTP response code is
sent by the request API. My previous fix broke the other responses, oops.

Closes #82

Relates #44

The refresh as introduced in my fix for #82 (!89) is reverted, as this
was already done on successful requests.
 2024-03-05 10:48:21 +01:00
kees 8218803ca8 feature(queue): refresh queue after requesting 
Closes #84
 2024-03-05 10:21:33 +01:00
kees 0e5fb7acd7 fix(queues): remove faulty update, add null-coalescing on song user 
Removal of update call might resolve #66, but I hope I do not negate
@tjibbegottmer's work.
 2024-02-27 23:20:23 +01:00
William Kuijltjes 521c047225 Auto-select search field in request tab 2024-02-27 22:37:35 +01:00
William Kuijltjes e45940772f Fix streepje from issue #48 2024-02-27 13:04:01 +01:00
kees 13448a2eec Merge branch 'fix/remember-song-details-unfold' into 'marietje-zuid' 
Keep song details unfolded between refreshes

Closes #79

See merge request technicie/MarietjeDjango!86
 2024-02-27 20:56:24 +01:00
keesandOlaf Slomp 77728c9a82 Replace shift shit with array filter 
Co-Authored-By: Olaf Slomp <git@oslomp.nl>
 2024-02-27 12:48:52 +01:00
kees 08cd59ce09 Store plays at/in in cookie 
Closes #73
 2024-02-27 12:16:38 +01:00
kees ad94fe7930 Keep song details unfolded between refreshes 
Closes #79
 2024-02-27 12:11:43 +01:00
kees 5acf553269 feat(queue): re-add song details on mobile view 
Closes #62
 2024-02-21 15:50:20 +01:00
Lars van Rhijn 4768271aee Marietje in header and fix load times for upload page 2024-02-21 15:40:41 +01:00
kees 2dd4dd3381 Merge branch 'fix/request-table' into 'marietje-zuid' 
Other container layout and responsive queue container

Closes #47

See merge request technicie/MarietjeDjango!67
 2024-02-21 12:28:25 +01:00
Lars van Rhijn 219af8fa1d Merge branch 'wkuijltjes/aesthetic-changes' into 'marietje-zuid' 
Some aesthetic changes to the dark mode colors and the table borders

See merge request technicie/MarietjeDjango!81
 2023-11-25 07:45:46 +01:00
William Kuijltjes 98e43aa688 Some aesthetic changes to the dark mode colors and the table borders 2023-11-25 07:45:46 +01:00
William Kuijltjes fbafcf1b06 Reduce the width of buttons in the control column and recombine them into one row 2023-11-25 07:44:45 +01:00
Lars van Rhijn 222ff7598a Replace a with button 2023-10-14 08:51:27 +02:00
kees 0672555d75 Reimplement personal queue length overview 
Closes #52

The functionality was partially removed in !62.
 2023-10-12 15:43:01 +02:00
William Kuijltjes 41b128e2d8 Changing a single lowercase letter to uppercase 2023-10-11 17:28:48 +02:00
kees 41f33f5d20 Merge branch 'feature/save-amount-shown-per-page' into 'marietje-zuid' 
Store page size on manage and request pages

Closes #51

See merge request technicie/MarietjeDjango!68
 2023-10-11 16:09:30 +02:00
William Kuijltjes 63cc1a8fe0 Sort tracks based on artist, then on title 2023-10-11 15:26:00 +02:00
Lars van Rhijn 7a1b0583a6 Store page size on manage and request pages 2023-10-04 20:41:00 +02:00
Lars van Rhijn 8a926f3924 Other container layout and responsive queue container 2023-10-04 20:31:49 +02:00
Lars van Rhijn c061d1c304 Fix scroll bug and add success/error messages 2023-10-04 20:21:43 +02:00
Lars van Rhijn d1a1be7e2e Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap 2023-09-14 19:55:51 +02:00
Daan Sprenkels e67bc8dc5a Merge branch 'dsprenkels/unlimited_queue_length' into 'marietje-zuid' 
queues: Fix unlimited_queue codename in check

See merge request dsprenkels/MarietjeDjango!57
 2020-06-16 10:38:35 +02:00
Daan Sprenkels e5fe2aa1cf queues: Fix unlimited_queue codename in check 2020-06-16 10:34:02 +02:00
Daan Sprenkels 64b26d03a1 admin: Use autocomplete for user field 
Before this patch, we used the default setting, which emits a HTML
<select> tag containing a list of *all* the users.  We currently
have enough users that we do not want to load that complete list
every time.  So now, use the autocomplete field instead.
 2020-06-15 17:34:20 +02:00
Daan Sprenkels 23f651bbd1 Fix pylint errors 2020-06-09 17:57:25 +02:00
Daan Sprenkels 3724b94e4a Add 'unlimited_queue_length' permission 
The 'unlimited_queue_length' permission allows a user to queue
songs without being restricted by the 45-minute queue length.
 2020-06-09 17:37:08 +02:00
Daan Sprenkels a3f501273f Revert "Merge branch 'oslomp/search_field' into 'marietje-zuid'" 
This reverts merge request !42
 2019-11-01 17:31:44 +01:00
Olaf Slomp 4c9a431f8a Merge both search-fields into one 2019-10-31 10:32:07 +01:00
Olaf Slomp 2fcd827b85 Visual changes 2019-04-08 18:09:14 +02:00
oslomp 7aa9d6ab2a changed the way it fixes the bug 2019-04-01 18:37:22 +02:00
oslomp b4b0d224ce fix visible skip-button for non-mods 2019-04-01 10:57:48 +02:00
Daan Sprenkels 00b2609f17 interface: Align button nav with other content 2019-03-29 14:29:24 +01:00
Daan Sprenkels 810e071eb4 Revert "Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'"" 
This reverts commit 102874cc86.
 2019-03-29 14:25:55 +01:00
Gerdriaan Mulder 102874cc86 Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'" 
This reverts merge request !30
 2019-03-28 19:05:09 +01:00
Olaf Slomp 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
 2019-03-28 18:54:46 +01:00
Daan Sprenkels 568f7c6a50 Add missing migration 2019-03-20 11:31:33 +01:00
Daan Sprenkels 22a8c3bd4a Merge branch 'playlistsongs' into 'marietje-zuid' 
Make song read-only in admin/playlistsong

See merge request dsprenkels/MarietjeDjango!27
 2019-03-20 11:24:22 +01:00