364 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
William Kuijltjes	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
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
Gerdriaan Mulder	452147ae87	Add new extra URL for marietje-zuid	2022-10-26 10:27:54 +02:00
kees	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
keesandGerdriaan Mulder	4491fc234b	Add beeldscherm ... Closes #20 Co-authored-by: Gerdriaan Mulder <mrngm@moeilijklastig.nl>	2022-07-06 13:46:15 +02:00
Daan Sprenkels	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
Daan Sprenkels	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
Daan Sprenkels	e5fe2aa1cf	queues: Fix unlimited_queue codename in check	2020-06-16 10:34:02 +02:00
Daan Sprenkels	9529ae245a	Add a more complete .gitignore file; NFC	2020-06-16 10:14:08 +02:00
Daan Sprenkels	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
Daan Sprenkels	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
Daan Sprenkels	b4a6530204	admin: Use autocomplete for inline reportuser	2020-06-15 17:52:20 +02:00
Daan Sprenkels	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
Daan Sprenkels	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
Daan Sprenkels	2ade1a7dfa	Merge branch 'marietje-zuid' into 'dsprenkels/songs-reportnote-filter' ... # Conflicts: # marietje/songs/admin.py	2020-06-15 17:13:52 +02:00
Daan Sprenkels	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
Daan Sprenkels	b604ac9955	admin: reports: Hide song list ... In 1b5b510, the complete list of songs was re-added. Loading this list is super slow and should not happen.	2020-06-15 17:10:18 +02:00
Daan Sprenkels	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
Daan Sprenkels	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
Daan Sprenkels	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
Daan Sprenkels	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
Daan Sprenkels	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
Daan Sprenkels	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
Olaf Slomp	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
Daan Sprenkels	23f651bbd1	Fix pylint errors	2020-06-09 17:57:25 +02:00
Daan Sprenkels	3724b94e4a	Add 'unlimited_queue_length' permission ... The 'unlimited_queue_length' permission allows a user to queue songs without being restricted by the 45-minute queue length.	2020-06-09 17:37:08 +02:00
Gerdriaan Mulder	4fdf25ac43	Merge branch 'marietje-zuid' into 'marietje-zuid' ... stats: show 'last updated' in full width on mobile See merge request dsprenkels/MarietjeDjango!49	2020-03-28 16:19:43 +01:00
Gerdriaan Mulder	83406ec0ab	stats: show 'last updated' in full width on mobile	2020-03-28 16:19:16 +01:00
Gerdriaan Mulder	e447a7c210	Merge branch 'marietje-zuid' into 'marietje-zuid' ... user-stats: fix layout, fixes #13 Closes #13 See merge request dsprenkels/MarietjeDjango!48	2020-03-28 15:59:06 +01:00
Gerdriaan Mulder	91d3b0cf35	user-stats: fix layout, fixes #13	2020-03-28 15:54:26 +01:00
Gerdriaan Mulder	228d0208f2	Merge branch 'marietje-zuid' into 'marietje-zuid' ... stats: show equal height columns See merge request dsprenkels/MarietjeDjango!47	2020-03-28 15:46:47 +01:00
Gerdriaan Mulder	62ba17ef67	stats: show equal height columns	2020-03-28 15:43:02 +01:00
Olaf Slomp	6a549fbd7b	Merge branch 'oslomp/quickfix_artists' into 'marietje-zuid' ... quickfix artist stat See merge request dsprenkels/MarietjeDjango!46	2020-03-28 15:11:44 +01:00
Olaf Slomp	371334326b	quickfix artist stat	2020-03-28 15:12:09 +01:00
Gerdriaan Mulder	40e2245d39	Merge branch 'oslomp/artists' into 'marietje-zuid' ... Artist statistics See merge request dsprenkels/MarietjeDjango!44	2020-03-28 14:26:31 +01:00
Olaf Slomp	c9ba37d291	Artist statistics	2020-03-28 14:26:31 +01:00
Gerdriaan Mulder	6ec3d57a39	Merge branch 'marietje-zuid' into 'marietje-zuid' ... Remove python2 compatibility library django.utils.six See merge request dsprenkels/MarietjeDjango!45	2020-03-28 14:09:16 +01:00
Gerdriaan Mulder	59993aa1c0	Remove unused import ASCIIUsernameValidator	2020-03-28 14:07:00 +01:00
Gerdriaan Mulder	a1116ca4cd	Remove python2 compatibility library django.utils.six	2020-03-28 14:01:13 +01:00
Daan Sprenkels	95bd47c46a	Bump django version	2020-03-04 14:56:04 +01:00
Daan Sprenkels	af6031c3a5	Merge branch 'revert-7af71276' into 'marietje-zuid' ... Revert "Merge branch 'oslomp/search_field' into 'marietje-zuid'" See merge request dsprenkels/MarietjeDjango!43	2019-11-01 17:34:22 +01:00
Daan Sprenkels	a3f501273f	Revert "Merge branch 'oslomp/search_field' into 'marietje-zuid'" ... This reverts merge request !42	2019-11-01 17:31:44 +01:00
Daan Sprenkels	7af7127612	Merge branch 'oslomp/search_field' into 'marietje-zuid' ... Merged both search-fields into one See merge request dsprenkels/MarietjeDjango!42	2019-10-31 10:32:07 +01:00
Olaf Slomp	4c9a431f8a	Merge both search-fields into one	2019-10-31 10:32:07 +01:00
Olaf Slomp	53d3c6e5c4	Closes #11	2019-10-26 08:48:33 +02:00
Olaf Slomp	581e14f7ef	Merge branch 'dsprenkels/issue_15' into 'marietje-zuid' ... Set all cache TTLs to 2 days Closes #15 See merge request dsprenkels/MarietjeDjango!39	2019-10-25 19:35:59 +02:00
Daan Sprenkels	d0ed0a0a62	Set all cache TTLs to 2 days ... Fixes #15.	2019-10-25 19:33:12 +02:00
Daan Sprenkels	ce3bfb02d5	Merge branch 'cron' into 'marietje-zuid' ... Regenerate caches after apply patch Closes #14 See merge request dsprenkels/MarietjeDjango!38	2019-10-25 19:20:51 +02:00