Commit Graph

62 Commits

Author SHA1 Message Date
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
63cc1a8fe0 Sort tracks based on artist, then on title 2023-10-11 15:26:00 +02:00
7a1b0583a6 Store page size on manage and request pages 2023-10-04 20:41:00 +02:00
c061d1c304 Fix scroll bug and add success/error messages 2023-10-04 20:21:43 +02:00
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
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
e5fe2aa1cf queues: Fix unlimited_queue codename in check 2020-06-16 10:34:02 +02:00
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
23f651bbd1 Fix pylint errors 2020-06-09 17:57:25 +02:00
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
a3f501273f Revert "Merge branch 'oslomp/search_field' into 'marietje-zuid'"
This reverts merge request !42
2019-11-01 17:31:44 +01:00
4c9a431f8a Merge both search-fields into one 2019-10-31 10:32:07 +01:00
2fcd827b85 Visual changes 2019-04-08 18:09:14 +02:00
7aa9d6ab2a changed the way it fixes the bug 2019-04-01 18:37:22 +02:00
b4b0d224ce fix visible skip-button for non-mods 2019-04-01 10:57:48 +02:00
00b2609f17 interface: Align button nav with other content 2019-03-29 14:29:24 +01:00
810e071eb4 Revert "Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'""
This reverts commit 102874cc86.
2019-03-29 14:25:55 +01:00
102874cc86 Revert "Merge branch 'marietje-zuid-interface' into 'marietje-zuid'"
This reverts merge request !30
2019-03-28 19:05:09 +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
2019-03-28 18:54:46 +01:00
568f7c6a50 Add missing migration 2019-03-20 11:31:33 +01:00
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
6fed97f62c Remove executed field from QueueCommand 2019-03-20 10:56:44 +01:00
be083fecfd made song read-only 2019-03-06 04:04:54 +01:00
88f709f34c Admin fix 2019-03-01 21:34:39 +01:00
19c1c70cd3 fix all pylint complaints 2019-01-23 19:44:38 +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
f6fcc63450 Song reporting and user stats 2018-12-14 16:59:44 +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
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
bac45e8b3d Set a str() for QueueCommand 2018-10-28 17:28:13 +01:00
383f12235a Add a db_index on PlaylistSong.user 2018-10-28 14:26:58 +01:00
844a198dcd Update queues admin interface 2018-10-10 18:31:42 +02:00
dfd4752dea Use southern style queue limit 2018-04-09 18:06:12 +02:00
7daacc50bb queues: Add an index on PlaylistSong.state 2018-04-09 17:51:27 +02:00
9110a1d9e9 Implement traditional queue length restrictions 2017-11-02 19:23:30 +01:00
416ae40763 Force updating of assets. 2017-10-05 18:07:09 +02:00
04cdce9ad4 Add more stats. 2017-10-05 18:07:09 +02:00
f6492a70df Fix race condition when requesting songs, causing them to get the same order value. 2017-10-05 18:07:09 +02:00
3abb39916d Add LIMIT_ALWAYS option which limits the queue length always 2017-10-05 18:06:43 +02:00
984a068880 Add mute button. 2017-09-05 14:02:27 +02:00
2a96b5eaf2 Merge branch 'feature/limit_hours' into 'master'
Limit hours when MAX_MINUTES_IN_A_ROW is in effect.

See merge request !8
2017-06-12 15:24:36 +02:00
43fe38404f Limit hours when MAX_MINUTES_IN_A_ROW is in effect. 2017-06-12 15:17:36 +02:00
df1a31efb7 Add maximum length a person can queue in a row. 2017-06-01 14:13:25 +02:00
753095e8bd Toggle column plays at with plays in. 2017-05-02 12:40:26 +02:00