Commit Graph

Select branches

Hide Pull Requests

feature/docker-build

feature/log-api-endpoints

feature/marietje-4.1-in-header

feature/player-endpoints

fix/poetry-install

fix/sort-title-artist

marietje-zuid

oslomp/artists

oslomp/quickfix_artists

search

tosti-information

Mono Color

• 8f698315dc Merge branch 'feature/improve-queueable' into 'marietje-zuid' marietje-zuid Daniël Visser 2024-09-10 17:27:12 +02:00
• 4bc3f38f69 Merge branch 'marietje-zuid' into 'feature/improve-queueable' Daniël Visser 2024-09-10 17:19:12 +02:00
• 6d545dddcc feat: grey-out already queued songs and make unclickable Tjibbe 2024-05-06 13:55:19 +02:00
• 3f947a934c Merge branch 'fix/communicate-file-too-large' into 'marietje-zuid' kees 2024-04-23 19:09:55 +02:00
• b5aa079254 Merge branch 'wkuijltjes/playsinat' into 'marietje-zuid' kees 2024-04-23 18:19:39 +02:00
• 7ab6bc6c78 fix(queues): remove redundant and faulty toggle_details call kees 2024-04-23 18:11:59 +02:00
• 3c2df2adfd styling(queues): move no underline to css kees 2024-04-23 17:56:58 +02:00
• 82dc7c0193 Merge branch 'wkuijltjes/fixtimer' into 'marietje-zuid' kees 2024-04-23 17:44:22 +02:00
• 6901d913c0 Merge branch 'wkuijltjes/aesthetics' into 'marietje-zuid' kees 2024-04-23 17:31:35 +02:00
• 0f85727c5d Brush up some details: reduce breakpoints on small screens, Requested by --> Requested By William Kuijltjes 2024-03-18 18:02:25 +01:00
• 2b2e0a0275 Fix dynamic times that should be static and vice versa if logged in user has queued William Kuijltjes 2024-03-18 16:51:34 +01:00
• 311e13f696 Fix toggling of Plays In/Plays At in mobile view William Kuijltjes 2024-03-18 12:45:15 +01:00
• cf76861961 Merge branch 'wkuijltjes/alignrequest' into 'marietje-zuid' kees 2024-03-05 14:27:46 +01:00
• d004ff81ac Left-align long song titles in the request tab with a lot of tender loving care from Kees xx William Kuijltjes 2024-03-05 14:21:56 +01:00
• 841e5daf8f Merge branch 'fix/now-really-fix-error-message-reporting' into 'marietje-zuid' kees 2024-03-05 13:25:13 +01:00
• beda2a4c63 Merge branch 'kvkempen/assorted-fixes-20240227' into 'marietje-zuid' kees 2024-03-05 12:57:51 +01:00
• 669e1e3b18 fix(queues): now really fix the request notifications kees 2024-03-05 10:45:16 +01:00
• 8218803ca8 feature(queue): refresh queue after requesting kees 2024-02-28 00:24:52 +01:00
• 5c32fcb1d1 fix(songs): handle HTTP 413 and remove redundant .json() calls kees 2024-02-28 00:20:06 +01:00
• 0e5fb7acd7 fix(queues): remove faulty update, add null-coalescing on song user kees 2024-02-27 23:06:33 +01:00
• ff3171022a chore: update dependencies kees 2024-02-27 22:58:23 +01:00
• 749546867a fix: set SameSite=Lax on cookies kees 2024-02-27 22:54:49 +01:00
• 2e65d7fd89 Merge branch 'wkuijltjes/searchfield' into 'marietje-zuid' kees 2024-02-27 22:37:35 +01:00
• 521c047225 Auto-select search field in request tab William Kuijltjes 2024-02-27 22:37:35 +01:00
• 0a3b2d2a8c Merge branch 'wkuijltjes/streepje' into 'marietje-zuid' kees 2024-02-27 21:08:48 +01:00
• e45940772f Fix streepje from issue #48 William Kuijltjes 2024-02-27 12:59:21 +01:00
• 13448a2eec Merge branch 'fix/remember-song-details-unfold' into 'marietje-zuid' kees 2024-02-27 20:56:24 +01:00
• fe186ffa99 Merge branch 'feature/remember-plays-at-in' into 'marietje-zuid' kees 2024-02-27 20:28:31 +01:00
• e30cc33ffc Merge branch 'oslomp/remove_pipeline' into 'marietje-zuid' kees 2024-02-27 20:20:18 +01:00
• 4d797691b1 Disable deployment pipeline William Kuijltjes 2024-02-27 20:20:18 +01:00
• 77728c9a82 Replace shift shit with array filter keesandOlaf Slomp 2024-02-27 12:48:52 +01:00
• 08cd59ce09 Store plays at/in in cookie kees 2024-02-27 11:41:17 +01:00
• ad94fe7930 Keep song details unfolded between refreshes kees 2024-02-27 12:11:43 +01:00
• 5acf553269 feat(queue): re-add song details on mobile view kees 2024-02-21 15:50:20 +01:00
• ec66f09a79 Merge branch 'feature/marietje-4.1-in-header' into 'marietje-zuid' kees 2024-02-21 15:40:41 +01:00
• 4768271aee Marietje in header and fix load times for upload page Lars van Rhijn 2024-02-21 15:40:41 +01:00
• 82583d21d8 fix: Poetry is picky and needs the module to match the folder feature/marietje-4.1-in-header kees 2024-02-21 15:33:39 +01:00
• eb1581e41e fix: fix typo in maintainer information kees 2024-02-21 15:28:38 +01:00
• ef250c72a6 Merge branch 'marietje-zuid' into 'feature/marietje-4.1-in-header' kees 2024-02-21 15:19:07 +01:00
• 6110cd6665 fix(songs): change new Vue to createApp kees 2024-02-21 13:54:41 +01:00
• 52b24e6b36 fix(queues): check response success besides status kees 2024-02-21 13:52:45 +01:00
• 2dd4dd3381 Merge branch 'fix/request-table' into 'marietje-zuid' kees 2024-02-21 12:28:25 +01:00
• 219af8fa1d Merge branch 'wkuijltjes/aesthetic-changes' into 'marietje-zuid' Lars van Rhijn 2023-11-25 07:45:46 +01:00
• 98e43aa688 Some aesthetic changes to the dark mode colors and the table borders William Kuijltjes 2023-11-25 07:45:46 +01:00
• 831f479eec Merge branch 'wkuijltjes/minor-edits-stats-pages' into 'marietje-zuid' Lars van Rhijn 2023-11-25 07:45:01 +01:00
• 6a9c22b7f8 Slightly improve stats pages William Kuijltjes 2023-11-25 07:45:01 +01:00
• 2d36ace60f Merge branch 'wkuijltjes/reduce-control-column-size' into 'marietje-zuid' Lars van Rhijn 2023-11-25 07:44:45 +01:00
• fbafcf1b06 Reduce the width of buttons in the control column and recombine them into one row William Kuijltjes 2023-11-25 07:44:45 +01:00
• 11e8ff11b8 Add logging for API endpoints feature/log-api-endpoints Lars van Rhijn 2023-11-25 07:38:28 +01:00
• 1ac89e09ad Fix CI pipeline and typo in pyproject.toml fix/poetry-install Lars van Rhijn 2023-11-24 22:40:48 +01:00
• 8da9672fc1 Add logging to API endpoints Lars van Rhijn 2023-11-24 22:35:16 +01:00
• d55ff6c8c6 Change player to OAuth protocol feature/player-endpoints Lars van Rhijn 2023-11-12 09:33:19 +01:00
• e738dc8ab5 Merge master Lars van Rhijn 2023-10-25 17:35:45 +02:00
• 66ac1076d3 Merge branch 'fix/scrolling-in-requests-page' into 'marietje-zuid' Ida Divincenzo 2023-10-14 15:20:14 +02:00
• 3d78ca954f Add Docker build and docker compose file feature/docker-build Lars van Rhijn 2023-10-14 11:21:30 +02:00
• 0e6eaa6076 Merge main Lars van Rhijn 2023-10-14 09:37:37 +02:00
• 222ff7598a Replace a with button Lars van Rhijn 2023-10-14 08:51:27 +02:00
• 4f134ab62a Merge branch 'wkuijltjes/fix-stats-linebreaking' into 'marietje-zuid' William Kuijltjes 2023-10-13 13:08:29 +02:00
• f4f6cd6eed Preventing the line breaking of some of the "# Requests" columns in the stats pages William Kuijltjes 2023-10-13 13:08:29 +02:00
• f516a31476 Merge branch 'fix/personal-queue-stats' into 'marietje-zuid' Ida Divincenzo 2023-10-13 08:58:37 +02:00
• 72a6e65e98 Update settings layout for uWSGI kees 2023-10-13 08:47:09 +02:00
• 16e99ea320 Merge branch 'fix/manage-page-shows-all-songs' into 'marietje-zuid' kees 2023-10-12 18:14:03 +02:00
• 107d5053d3 Show only songs that match the user on manage page Lars van Rhijn 2023-10-12 18:14:03 +02:00
• d79e3425f4 New song library Lars van Rhijn 2023-10-12 17:25:26 +02:00
• 0672555d75 Reimplement personal queue length overview kees 2023-10-12 15:38:56 +02:00
• e280fd567d Merge branch 'marietje-zuid' into feature/marietje-4.1-in-header Lars van Rhijn 2023-10-11 17:35:44 +02:00
• 1f831a6dab Fixed space Lars van Rhijn 2023-10-11 17:32:12 +02:00
• 3786368810 Merge branch 'wkuijltjes/capitalising-a-single-lowercase' into 'marietje-zuid' Lars van Rhijn 2023-10-11 17:28:48 +02:00
• 41b128e2d8 Changing a single lowercase letter to uppercase William Kuijltjes 2023-10-11 17:28:48 +02:00
• f69d0f1377 Merge branch 'fix/beeldscherm-marietje-null' into 'marietje-zuid' Lars van Rhijn 2023-10-11 17:22:04 +02:00
• 04bf9532e4 Fix beeldscherm by resolving null to marietje kees 2023-10-11 17:22:04 +02:00
• 36f2830d48 Merge branch 'feature/announcements' into 'marietje-zuid' Lars van Rhijn 2023-10-11 16:49:37 +02:00
• a78098198f Add announcements app Lars van Rhijn 2023-10-11 16:49:37 +02:00
• 5c0480853a Merge branch 'fix/forgot-password-page' into 'marietje-zuid' kees 2023-10-11 16:17:47 +02:00
• 41f33f5d20 Merge branch 'feature/save-amount-shown-per-page' into 'marietje-zuid' kees 2023-10-11 16:09:30 +02:00
• a9e0614b2c Merge branch 'feature/development-settings' into 'marietje-zuid' Lars van Rhijn 2023-10-11 16:02:25 +02:00
• 4c10d2308c Split production and development settings Lars van Rhijn 2023-10-11 16:02:25 +02:00
• d19a115bbe Merge branch 'fix/sort-artist-title' into 'marietje-zuid' kees 2023-10-11 15:26:00 +02:00
• 63cc1a8fe0 Sort tracks based on artist, then on title William Kuijltjes 2023-10-11 15:26:00 +02:00
• d8fa14e377 Fix bug for Forgot Password page Lars van Rhijn 2023-10-06 20:49:18 +02:00
• 196eb73157 Sort tracks based on title, then on artist fix/sort-title-artist Lars van Rhijn 2023-10-06 20:45:14 +02:00
• 7a1b0583a6 Store page size on manage and request pages Lars van Rhijn 2023-10-04 20:41:00 +02:00
• 8a926f3924 Other container layout and responsive queue container Lars van Rhijn 2023-10-04 20:31:49 +02:00
• c061d1c304 Fix scroll bug and add success/error messages Lars van Rhijn 2023-10-04 20:21:43 +02:00
• b2429f941b Marietje in header and fix load times for upload page Lars van Rhijn 2023-10-04 20:00:18 +02:00
• 12e47ce6c2 Merge branch 'wkuijltjes-fixURLs' into 'marietje-zuid' kees 2023-09-26 09:53:27 +02:00
• 09c6c35bb7 Include uWSGI for production use, update pyproject.toml kees 2023-09-18 12:30:19 +02:00
• ccaa3a4604 Merge branch 'chore/upgrade-django' into 'marietje-zuid' Lars van Rhijn 2023-09-14 19:55:51 +02:00
• d1a1be7e2e Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap Lars van Rhijn 2023-09-14 19:55:51 +02:00
• ed85dcac9a Removed a backslash that wasn't used before so just for autism's sake (and consistency) William Kuijltjes 2023-05-25 10:10:14 +02:00
• c18d5d5f7b Changed the Issues (and Merge Requests) URL, since these directed to the old location of the repo, at the personal GitLab account of a Marietje admin. The new location (the Technicie Git) should work until further notice. William Kuijltjes 2023-05-25 10:06:24 +02:00
• 379ababcc0 Merge branch 'gitlab-ci-to-debian-11.3' into 'marietje-zuid' kees 2022-10-28 08:47:59 +02:00
• afee3630fa Merge branch 'implement-beeldscherm' into 'marietje-zuid' kees 2022-10-28 08:46:10 +02:00
• ea93c4e6b6 git ignore Django generated files kees 2022-10-26 10:20:17 +02:00
• 452147ae87 Add new extra URL for marietje-zuid Gerdriaan Mulder 2022-10-26 10:19:19 +02:00
• d17c6d8b18 api: Fix requestor in queue.png tosti-information kees 2022-07-06 16:12:13 +02:00
• ef627318ba api: Add image endpoint for use on tosti.science.ru.nl kees 2022-07-06 16:03:10 +02:00
• 4fda75d065 ci: Switch to Debian Bullseye image to reflect upgrade marietje kees 2022-07-06 14:36:50 +02:00
• 4491fc234b Add beeldscherm keesandGerdriaan Mulder 2022-07-06 11:01:11 +02:00
• b1a080799c Merge branch 'dsprenkels/gitignore' into 'marietje-zuid' Daan Sprenkels 2020-06-16 10:50:22 +02:00