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
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
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
ea93c4e6b6
git ignore Django generated files
2022-10-26 10:27:54 +02:00
452147ae87
Add new extra URL for marietje-zuid
2022-10-26 10:27:54 +02:00
4fda75d065
ci: Switch to Debian Bullseye image to reflect upgrade marietje
...
Seems to fix the Gitlab pipeline.
2022-07-06 14:36:50 +02:00
4491fc234b
Add beeldscherm
...
Closes #20
Co-authored-by: Gerdriaan Mulder <mrngm@moeilijklastig.nl >
2022-07-06 13:46:15 +02:00
b1a080799c
Merge branch 'dsprenkels/gitignore' into 'marietje-zuid'
...
Add a more complete .gitignore file; NFC
See merge request dsprenkels/MarietjeDjango!58
2020-06-16 10:50:22 +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
9529ae245a
Add a more complete .gitignore file; NFC
2020-06-16 10:14:08 +02:00
a325ebbe82
Merge branch 'dsprenkels/songs-reportnote-filter' into 'marietje-zuid'
...
Add a filter on reportnote count in the Songs admin list
See merge request dsprenkels/MarietjeDjango!52
2020-06-15 18:08:26 +02:00
a422e6d4f5
Merge branch 'dsprenkels/admin-optimizations' into 'marietje-zuid'
...
admin: Use autocomplete for inline reportuser
See merge request dsprenkels/MarietjeDjango!56
2020-06-15 17:54:33 +02:00
b4a6530204
admin: Use autocomplete for inline reportuser
2020-06-15 17:52:20 +02:00
1292694c4a
Merge branch 'dsprenkels/admin-optimizations' into 'marietje-zuid'
...
admin: Use autocomplete for user field
See merge request dsprenkels/MarietjeDjango!55
2020-06-15 17:39:28 +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
2ade1a7dfa
Merge branch 'marietje-zuid' into 'dsprenkels/songs-reportnote-filter'
...
# Conflicts:
# marietje/songs/admin.py
2020-06-15 17:13:52 +02:00
1a797a5d98
Merge branch 'dsprenkels/notes-song-link' into 'marietje-zuid'
...
admin: reports: Hide song list
See merge request dsprenkels/MarietjeDjango!54
2020-06-15 17:11:06 +02:00
b604ac9955
admin: reports: Hide song list
...
In 1b5b510
2020-06-15 17:10:18 +02:00
bb6166c1db
Merge branch 'notes-song-link' into 'marietje-zuid'
...
Add a link to relevant song in ReportNote admin interface
See merge request dsprenkels/MarietjeDjango!51
2020-06-15 16:31:35 +02:00
3aa876e223
Merge branch 'dsprenkels/freeze-pylint' into 'marietje-zuid'
...
Freeze pylint version
See merge request dsprenkels/MarietjeDjango!53
2020-06-15 16:27:50 +02:00
61fa646353
ci: Freeze pylint version
...
This will prevent the CI from "randomly" breaking every now and
then, because of added lints in pylint. From now on, pylint is
updated manually.
2020-06-15 16:26:12 +02:00
416fb3e5a9
admin: songs: Add a filter on reportnote count
...
This filter allows the admin to list only the songs that have a
report note that needs to be resolved.
2020-06-15 16:14:10 +02:00
1b5b5106ba
report-note: admin: Add a link to relevant song
...
Previously, the admin could not directly move from a report note to
its corresponding song. This commit adds a link that will go
directly to the "change" page for the corresponding song.
2020-06-15 15:18:37 +02:00
4a1df11b40
Merge branch 'oslomp/issue_11' into 'marietje-zuid'
...
api: Only allow POST requests on views.skip
Closes #11
See merge request dsprenkels/MarietjeDjango!41
2020-06-11 09:28:51 +02:00
f4ab85106d
Merge branch 'unlimited_queue_length' into 'marietje-zuid'
...
Add 'unlimited_queue_length' permission
See merge request dsprenkels/MarietjeDjango!50
2020-06-10 11:13:06 +02:00
23f651bbd1
Fix pylint errors
2020-06-09 17:57:25 +02:00
