concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2017-04-01T11:29:53+02:00https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/434[HOTFIX] Fix error for events without organiser2017-04-01T11:29:53+02:00Thom Wiggers[HOTFIX] Fix error for events without organiserFix error for events without organiser
Closes #373
See merge request !431Fix error for events without organiser
Closes #373
See merge request !431Joost Rijneveldjoost@joostrijneveld.nlJoost Rijneveldjoost@joostrijneveld.nlhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/432Fix path traversal2017-04-05T21:50:55+02:00Thom WiggersFix path traversalAdds some tests, during which I found a path traversal attack. See #377.Adds some tests, during which I found a path traversal attack. See #377.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/435utils/thumbnails: document thumbnail url usage2017-04-05T21:50:55+02:00Joost Rijneveldjoost@joostrijneveld.nlutils/thumbnails: document thumbnail url usageI had forgotten why we were doing this when reading #378. Perhaps a comment will help in the future.I had forgotten why we were doing this when reading #378. Perhaps a comment will help in the future.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/436[HOTFIX] Fix path traversal2017-04-01T12:23:37+02:00Thom Wiggers[HOTFIX] Fix path traversalFix path traversal
Closes #377
See merge request !432Fix path traversal
Closes #377
See merge request !432https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/429Fix setting all users not on waiting list or cancelled to present and paid2017-04-05T21:50:55+02:00Sébastiaan VersteegFix setting all users not on waiting list or cancelled to present and paidCloses #374
Before: 'Zet iedereen op betaald en present' -> 500
After: 'Zet iedereen op betaald en present' -> Does what it shouldCloses #374
Before: 'Zet iedereen op betaald en present' -> 500
After: 'Zet iedereen op betaald en present' -> Does what it shouldhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/427Randomly order vacancies2017-04-05T21:50:55+02:00Sébastiaan VersteegRandomly order vacanciesCloses #368
Before:
1. Go to the vacancies page
2. Notice that the vacancies are ordered by id
After:
1. Go to the vacancies page
2. Notice that the vacancies are randomly orderedCloses #368
Before:
1. Go to the vacancies page
2. Notice that the vacancies are ordered by id
After:
1. Go to the vacancies page
2. Notice that the vacancies are randomly orderedhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/440Fix the ModelAdmin change permissions2017-04-05T21:50:55+02:00Thom WiggersFix the ModelAdmin change permissionsJoost Rijneveldjoost@joostrijneveld.nlJoost Rijneveldjoost@joostrijneveld.nlhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/437Dockerfile: Move statics such as entrypoint up in the build2017-04-05T21:50:55+02:00Thom WiggersDockerfile: Move statics such as entrypoint up in the buildSlightly speeds up `docker-compose build`.Slightly speeds up `docker-compose build`.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/438Bound announcements on datetime instead of date2017-04-05T21:50:55+02:00Joost Rijneveldjoost@joostrijneveld.nlBound announcements on datetime instead of dateZoals @lscholten vorige week suggereerde. Geen idee waarom dit ooit date-objecten waren.Zoals @lscholten vorige week suggereerde. Geen idee waarom dit ooit date-objecten waren.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/441Add permission that overrides event organiser restrictions2017-04-05T21:50:55+02:00Joost Rijneveldjoost@joostrijneveld.nlAdd permission that overrides event organiser restrictionsCloses #376Closes #376https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/442Update requirements (move to Django 1.11)2017-04-05T21:50:55+02:00Thom WiggersUpdate requirements (move to Django 1.11)Updates to Django 1.11 and also updates some dependencies.Updates to Django 1.11 and also updates some dependencies.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/439Also include mailinglist aliasses in API output2017-04-11T10:34:21+02:00Joost Rijneveldjoost@joostrijneveld.nlAlso include mailinglist aliasses in API outputCloses #363
Previously, aliasses were ignored. Now they appear in API output as `pk_aliasname` in the lists overview. When calling the API as `list=pk_aliasname`, the list with id `pk` is returned and its name is replaced with `aliasn...Closes #363
Previously, aliasses were ignored. Now they appear in API output as `pk_aliasname` in the lists overview. When calling the API as `list=pk_aliasname`, the list with id `pk` is returned and its name is replaced with `aliasname` _if this is a valid alias for this list_.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/444Fix deprecation warnings for Django 1.112017-04-05T21:50:54+02:00Thom WiggersFix deprecation warnings for Django 1.11https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/443Make Event.organiser NOT NULL2017-04-05T21:50:54+02:00Thom WiggersMake Event.organiser NOT NULLCloses #379Closes #379https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/447Conform Gitlab CI variables to 9.0 naming2017-04-26T19:51:49+02:00Luuk ScholtenConform Gitlab CI variables to 9.0 namingOld variables were deprecated
Closes #372Old variables were deprecated
Closes #372Thom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/452Fix board wiki permission2017-04-26T19:51:49+02:00Thom WiggersFix board wiki permission@kirstenkingma reported that she couldn't access the board wiki pages or other wikis (she should be allowed to from the permissions assigned to the 'bestuur' group in the wiki). It turned out that the 'bestuur' group was never assigned t...@kirstenkingma reported that she couldn't access the board wiki pages or other wikis (she should be allowed to from the permissions assigned to the 'bestuur' group in the wiki). It turned out that the 'bestuur' group was never assigned to non-admins as the `has_perm` call was wrong.
## Before
1. Create user without superuser access and assign it the `bestuur.board_wiki` permission
2. Try to log in to the wiki (`curl -X POST -d "apikey=apikey&user=twiggers&password=password" https://thalia.nu/api/wikilogin`)
3. Observe that the `bestuur` group isn't in the response
## After
1. Do steps one and two as above
2. Observe the `bestuur` group in the responsehttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/453Fix translation of text on assocation page2017-04-26T19:51:49+02:00Sébastiaan VersteegFix translation of text on assocation pageCloses #401
Before:
No Twitter icon on association page and incorrect HTML
After:
Working Twitter icon on association page.Closes #401
Before:
No Twitter icon on association page and incorrect HTML
After:
Working Twitter icon on association page.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/424Make sure boards 'end' on profile page and sort multiple memberships of same ...2017-04-26T19:51:49+02:00Sébastiaan VersteegMake sure boards 'end' on profile page and sort multiple memberships of same committee by dateCloses #364
Boards:
Before:
1. Go to the profile page of a user that _was_ in board
2. Notice that the text states 'now'
After:
1. Go to the profile page of a user that _was_ in board
2. Notice that the text states either the ...Closes #364
Boards:
Before:
1. Go to the profile page of a user that _was_ in board
2. Notice that the text states 'now'
After:
1. Go to the profile page of a user that _was_ in board
2. Notice that the text states either the end date of the membership or the end date of the board
3. Notice that the role is shown on the profile
Membership sorting:
Before:
1. Go to the profile page of a user that has multiple membership objects of the same committee
2. Notice that the memberships are randomly ordered
After:
1. Go to the profile page of a user that has multiple membership objects of the same committee
2. Notice that the memberships are sorted by date
https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/454Strip the tags from the markup in mouseover tooltips2017-04-19T20:02:18+02:00Milan van StiphoutStrip the tags from the markup in mouseover tooltipsCloses #406Closes #406https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/446Profile page board role2017-04-19T20:05:43+02:00Sébastiaan VersteegProfile page board roleBlocked by !424 (was makkelijker)
Closes #365
Boards:
Before:
1. Go to the profile page of a user that is/was in board
2. Notice that the text shows no role.
After:
1. Go to the profile page of a user that is/was in board
2. ...Blocked by !424 (was makkelijker)
Closes #365
Boards:
Before:
1. Go to the profile page of a user that is/was in board
2. Notice that the text shows no role.
After:
1. Go to the profile page of a user that is/was in board
2. Notice that the text shows the user's role (if entered in the model)