technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2026-09-27 09:00:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
378 Commits 11 Branches 0 Tags
82dc7c01932659305c01db288191dca25c1501ed
Commit Graph
33 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
kees 0672555d75 Reimplement personal queue length overview 
Closes #52

The functionality was partially removed in !62.
 2023-10-12 15:43:01 +02:00
kees 04bf9532e4 Fix beeldscherm by resolving null to marietje 2023-10-11 17:22:04 +02:00
kees 5c0480853a Merge branch 'fix/forgot-password-page' into 'marietje-zuid' 
Fix bug for Forgot Password page

Closes #54

See merge request technicie/MarietjeDjango!70
 2023-10-11 16:17:47 +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
kees d19a115bbe Merge branch 'fix/sort-artist-title' into 'marietje-zuid' 
Sort tracks based on artist, then on title

Closes #57 and #55

See merge request technicie/MarietjeDjango!72
 2023-10-11 15:26:00 +02:00
kees 12e47ce6c2 Merge branch 'wkuijltjes-fixURLs' into 'marietje-zuid' 
Update some URLs that no longer worked

See merge request technicie/MarietjeDjango!63
 2023-09-26 09:53:27 +02:00
kees 09c6c35bb7 Include uWSGI for production use, update pyproject.toml 2023-09-20 16:31:51 +02:00
kees 379ababcc0 Merge branch 'gitlab-ci-to-debian-11.3' into 'marietje-zuid' 
ci: Switch to Debian Bullseye image to reflect upgrade marietje

See merge request technicie/MarietjeDjango!60
 2022-10-28 08:47:59 +02:00
kees afee3630fa Merge branch 'implement-beeldscherm' into 'marietje-zuid' 
Implement beeldscherm

Closes #20

See merge request technicie/MarietjeDjango!59
 2022-10-28 08:46:10 +02:00
kees ea93c4e6b6 git ignore Django generated files 2022-10-26 10:27:54 +02:00