82583d21d8
fix: Poetry is picky and needs the module to match the folder
2024-02-21 15:33:39 +01:00
eb1581e41e
fix: fix typo in maintainer information
2024-02-21 15:28:38 +01:00
ef250c72a6
Merge branch 'marietje-zuid' into 'feature/marietje-4.1-in-header'
...
# Conflicts:
# marietje/queues/templates/queues/queue.html
2024-02-21 15:19:07 +01:00
6110cd6665
fix(songs): change new Vue to createApp
2024-02-21 13:54:41 +01:00
52b24e6b36
fix(queues): check response success besides status
2024-02-21 13:52:45 +01:00
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
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
98e43aa688
Some aesthetic changes to the dark mode colors and the table borders
2023-11-25 07:45:46 +01:00
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
6a9c22b7f8
Slightly improve stats pages
2023-11-25 07:45:01 +01:00
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
fbafcf1b06
Reduce the width of buttons in the control column and recombine them into one row
2023-11-25 07:44:45 +01:00
e738dc8ab5
Merge master
2023-10-25 17:35:45 +02:00
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
0e6eaa6076
Merge main
2023-10-14 09:37:37 +02:00
222ff7598a
Replace a with button
2023-10-14 08:51:27 +02:00
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
f4f6cd6eed
Preventing the line breaking of some of the "# Requests" columns in the stats pages
2023-10-13 13:08:29 +02:00
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
72a6e65e98
Update settings layout for uWSGI
2023-10-13 08:47:45 +02:00
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
107d5053d3
Show only songs that match the user on manage page
2023-10-12 18:14:03 +02:00
d79e3425f4
New song library
2023-10-12 17:25:26 +02:00
0672555d75
Reimplement personal queue length overview
...
Closes #52
The functionality was partially removed in !62 .
2023-10-12 15:43:01 +02:00
e280fd567d
Merge branch 'marietje-zuid' into feature/marietje-4.1-in-header
2023-10-11 17:35:44 +02:00
1f831a6dab
Fixed space
2023-10-11 17:32:12 +02:00
3786368810
Merge branch 'wkuijltjes/capitalising-a-single-lowercase' into 'marietje-zuid'
...
Changing a single lowercase letter to uppercase
See merge request technicie/MarietjeDjango!74
2023-10-11 17:28:48 +02:00
41b128e2d8
Changing a single lowercase letter to uppercase
2023-10-11 17:28:48 +02:00
f69d0f1377
Merge branch 'fix/beeldscherm-marietje-null' into 'marietje-zuid'
...
Fix beeldscherm by resolving null to marietje
See merge request technicie/MarietjeDjango!73
2023-10-11 17:22:04 +02:00
04bf9532e4
Fix beeldscherm by resolving null to marietje
2023-10-11 17:22:04 +02:00
36f2830d48
Merge branch 'feature/announcements' into 'marietje-zuid'
...
Add announcements app
See merge request technicie/MarietjeDjango!71
2023-10-11 16:49:37 +02:00
a78098198f
Add announcements app
2023-10-11 16:49:37 +02:00
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
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
a9e0614b2c
Merge branch 'feature/development-settings' into 'marietje-zuid'
...
Split production and development settings
Closes #34
See merge request technicie/MarietjeDjango!64
2023-10-11 16:02:25 +02:00
4c10d2308c
Split production and development settings
2023-10-11 16:02:25 +02:00
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
63cc1a8fe0
Sort tracks based on artist, then on title
2023-10-11 15:26:00 +02:00
d8fa14e377
Fix bug for Forgot Password page
2023-10-06 20:49:18 +02:00
7a1b0583a6
Store page size on manage and request pages
2023-10-04 20:41:00 +02:00
8a926f3924
Other container layout and responsive queue container
2023-10-04 20:31:49 +02:00
c061d1c304
Fix scroll bug and add success/error messages
2023-10-04 20:21:43 +02:00
b2429f941b
Marietje in header and fix load times for upload page
2023-10-04 20:00:18 +02:00
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
09c6c35bb7
Include uWSGI for production use, update pyproject.toml
2023-09-20 16:31:51 +02:00
ccaa3a4604
Merge branch 'chore/upgrade-django' into 'marietje-zuid'
...
Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap
Closes #24 , #21 , #25 , #16 , #8 , and #30
See merge request technicie/MarietjeDjango!62
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
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)
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.
2023-05-25 10:06:24 +02:00
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
