technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2026-09-27 01:50:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
387 Commits 11 Branches 0 Tags
marietje-zuid
Commit Graph
387 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniël Visser 8f698315dc Merge branch 'feature/improve-queueable' into 'marietje-zuid' 
Improvement to the visibility of already queued songs

See merge request technicie/MarietjeDjango!96
 2024-09-10 17:27:12 +02:00
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 3f947a934c Merge branch 'fix/communicate-file-too-large' into 'marietje-zuid' 
fix(songs): handle HTTP 413 and remove redundant .json() calls

Closes #76

See merge request technicie/MarietjeDjango!90
 2024-04-23 19:09:55 +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
kees 6901d913c0 Merge branch 'wkuijltjes/aesthetics' into 'marietje-zuid' 
Brush up some details: reduce breakpoints on small screens, Requested by --> Requested By

See merge request technicie/MarietjeDjango!95
 2024-04-23 17:31:35 +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
kees cf76861961 Merge branch 'wkuijltjes/alignrequest' into 'marietje-zuid' 
Left-align long song titles in the request tab with a lot of tender loving care from Kees xx

Closes #81

See merge request technicie/MarietjeDjango!92
 2024-03-05 14:27:46 +01:00
kees 841e5daf8f Merge branch 'fix/now-really-fix-error-message-reporting' into 'marietje-zuid' 
fix(queues): now really fix the request notifications

Closes #82

See merge request technicie/MarietjeDjango!91
 2024-03-05 13:25:13 +01:00
kees beda2a4c63 Merge branch 'kvkempen/assorted-fixes-20240227' into 'marietje-zuid' 
Assorted fixes on the night of 2024-02-27

Closes #84, #66, and #77

See merge request technicie/MarietjeDjango!89
 2024-03-05 12:57:51 +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 5c32fcb1d1 fix(songs): handle HTTP 413 and remove redundant .json() calls 
Closes #76
 2024-02-28 00:20:57 +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
kees ff3171022a chore: update dependencies 
Was a chore, but also fixes a FontAwesome warning in Firefox.

Closes #77
 2024-02-27 23:20:23 +01:00
kees 749546867a fix: set SameSite=Lax on cookies 
Prevents Firefox warning.
 2024-02-27 23:20:23 +01:00
kees 2e65d7fd89 Merge branch 'wkuijltjes/searchfield' into 'marietje-zuid' 
Auto-select search field in request tab

Closes #42

See merge request technicie/MarietjeDjango!88
 2024-02-27 22:37:35 +01:00
William Kuijltjes 521c047225 Auto-select search field in request tab 2024-02-27 22:37:35 +01:00
kees 0a3b2d2a8c Merge branch 'wkuijltjes/streepje' into 'marietje-zuid' 
Fix streepje from issue #48

Closes #48

See merge request technicie/MarietjeDjango!84
 2024-02-27 21:08:48 +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
kees fe186ffa99 Merge branch 'feature/remember-plays-at-in' into 'marietje-zuid' 
Store plays at/in in cookie

Closes #73

See merge request technicie/MarietjeDjango!87
 2024-02-27 20:28:31 +01:00
kees e30cc33ffc Merge branch 'oslomp/remove_pipeline' into 'marietje-zuid' 
disabled deployment pipeline

See merge request technicie/MarietjeDjango!85
 2024-02-27 20:20:18 +01:00
William Kuijltjes 4d797691b1 Disable deployment pipeline 
It is broken since the migration to the new server.
 2024-02-27 20:20:18 +01:00
William Kuijltjes e45940772f Fix streepje from issue #48 2024-02-27 13:04:01 +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
kees ec66f09a79 Merge branch 'feature/marietje-4.1-in-header' into 'marietje-zuid' 
Marietje in header and fix load times for upload page

Adds the Marietje header back into the mobile view. Also fixes an issue
with the upload page loading taking a long time due to a large id3
library.
Finally, this fixes errors running the pipeline: the project name is
changed to the folder name (marietje) and a typo was removed from one
of the maintainer names.

Closes #39, #37, and #44

See merge request technicie/MarietjeDjango!65
 2024-02-21 15:42:01 +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
Lars van Rhijn 831f479eec Merge branch 'wkuijltjes/minor-edits-stats-pages' into 'marietje-zuid' 
Slightly improve stats pages

Closes #69

See merge request technicie/MarietjeDjango!80
 2023-11-25 07:45:01 +01:00
William Kuijltjes 6a9c22b7f8 Slightly improve stats pages 2023-11-25 07:45:01 +01:00
Lars van Rhijn 2d36ace60f Merge branch 'wkuijltjes/reduce-control-column-size' into 'marietje-zuid' 
Reduce the width of buttons in the control column and recombine them into one row

Closes #68

See merge request technicie/MarietjeDjango!79
 2023-11-25 07:44:45 +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
Ida Divincenzo 66ac1076d3 Merge branch 'fix/scrolling-in-requests-page' into 'marietje-zuid' 
Replace a with button

Closes #41

See merge request technicie/MarietjeDjango!77
 2023-10-14 15:20:14 +02:00
Lars van Rhijn 222ff7598a Replace a with button 2023-10-14 08:51:27 +02:00
William Kuijltjes 4f134ab62a Merge branch 'wkuijltjes/fix-stats-linebreaking' into 'marietje-zuid' 
Preventing the line breaking of some of the "# Requests" columns in the stats pages

Closes #43

See merge request technicie/MarietjeDjango!76
 2023-10-13 13:08:29 +02:00
William Kuijltjes f4f6cd6eed Preventing the line breaking of some of the "# Requests" columns in the stats pages 2023-10-13 13:08:29 +02:00
Ida Divincenzo f516a31476 Merge branch 'fix/personal-queue-stats' into 'marietje-zuid' 
Reimplement personal queue length overview

Closes #52

See merge request technicie/MarietjeDjango!75
 2023-10-13 08:58:37 +02:00
kees 72a6e65e98 Update settings layout for uWSGI 2023-10-13 08:47:45 +02:00
kees 16e99ea320 Merge branch 'fix/manage-page-shows-all-songs' into 'marietje-zuid' 
Show only songs that match the user on manage page

Closes #45

See merge request technicie/MarietjeDjango!66
 2023-10-12 18:14:03 +02:00