concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2018-01-17T14:04:26+01:00https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/661Fix photos index view if more than 7 pages exist2018-01-17T14:04:26+01:00Tom van BusselFix photos index view if more than 7 pages existCloses no issue
#### Previous behaviour
Steps to reproduce:
1. Add enough albums such that the index view contains more than 7 pages.
2. Go to the photos
3. Error
#### New behaviour
Steps to validate that it works:
1. Add enough albu...Closes no issue
#### Previous behaviour
Steps to reproduce:
1. Add enough albums such that the index view contains more than 7 pages.
2. Go to the photos
3. Error
#### New behaviour
Steps to validate that it works:
1. Add enough albums such that the index view contains more than 7 pages.
2. Go to the photos
3. No errorhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/663Really fix photos pagination this time2018-01-17T20:07:24+01:00Tom van BusselReally fix photos pagination this timeCloses no issue
#### Previous behaviour
Steps to reproduce:
1. Create enough albums so that the index has multiple pages.
2. Go to the second page.
3. Crash
#### New behaviour
Steps to validate that it works:
1. Create enough albums ...Closes no issue
#### Previous behaviour
Steps to reproduce:
1. Create enough albums so that the index has multiple pages.
2. Go to the second page.
3. Crash
#### New behaviour
Steps to validate that it works:
1. Create enough albums so that the index has multiple pages.
2. Go to the second page.
3. No crashhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/664Remove old prefetches from the mailinglists2018-01-17T20:07:33+01:00Tom van BusselRemove old prefetches from the mailinglistsCloses #ISSUE
#### Previous behaviour
Steps to reproduce:
1. Go to http://localhost:8000/api/v1/mailinglists/?secret=XXXX
2. Crash
#### New behaviour
Steps to validate that it works:
1. Go to http://localhost:8000/api/v1/mailinglists...Closes #ISSUE
#### Previous behaviour
Steps to reproduce:
1. Go to http://localhost:8000/api/v1/mailinglists/?secret=XXXX
2. Crash
#### New behaviour
Steps to validate that it works:
1. Go to http://localhost:8000/api/v1/mailinglists/?secret=XXXX
2. It workshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/666Fix event pages when user is not logged in2018-01-17T20:22:26+01:00Tom van BusselFix event pages when user is not logged inCloses no issue
#### Previous behaviour
Steps to reproduce:
1. Create an event
2. Go to the event without being logged in
3. Crash
#### New behaviour
Steps to validate that it works:
1. Create an event
2. Go to the event without bei...Closes no issue
#### Previous behaviour
Steps to reproduce:
1. Create an event
2. Go to the event without being logged in
3. Crash
#### New behaviour
Steps to validate that it works:
1. Create an event
2. Go to the event without being logged in
3. No crashhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/673Fix wikilogin2018-01-18T11:08:34+01:00Sébastiaan VersteegFix wikiloginCloses no issue
#### Previous behaviour
Steps to reproduce:
1. Login to the wiki
2. Crash
#### New behaviour
Steps to validate that it works:
1. Login to the wiki
2. WorksCloses no issue
#### Previous behaviour
Steps to reproduce:
1. Login to the wiki
2. Crash
#### New behaviour
Steps to validate that it works:
1. Login to the wiki
2. Workshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/676Send website emails not from info@thalia.nu2018-01-22T17:00:30+01:00Thom WiggersSend website emails not from info@thalia.nu#### Previous behaviour
Steps to reproduce:
1. Have the site send mail (note: won't reproduce right now, I've hacked it such that `info@` is currently allowed).
#### New behaviour
Steps to validate that it works:
1. Send email.#### Previous behaviour
Steps to reproduce:
1. Have the site send mail (note: won't reproduce right now, I've hacked it such that `info@` is currently allowed).
#### New behaviour
Steps to validate that it works:
1. Send email.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/681Removed usage of old is_active method in newsletters app2018-01-22T16:45:53+01:00Tom van BusselRemoved usage of old is_active method in newsletters appCloses #562
#### Previous behaviour
Steps to reproduce:
1. Create a user.
2. Create a newsletter.
3. Try to send it.
4. Crash!
#### New behaviour
Steps to validate that it works:
1. Create a user.
2. Create a newsletter.
3. Try to ...Closes #562
#### Previous behaviour
Steps to reproduce:
1. Create a user.
2. Create a newsletter.
3. Try to send it.
4. Crash!
#### New behaviour
Steps to validate that it works:
1. Create a user.
2. Create a newsletter.
3. Try to send it.
4. No crash!https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/690Fix auth token for JSON requests2018-01-31T20:43:23+01:00Sébastiaan VersteegFix auth token for JSON requests#### Previous behaviour
Steps to reproduce:
1. Do a call to auth-token API with `application/json` mime
2. Crash boom broken
#### New behaviour
Steps to validate that it works:
1. Do a call to auth-token API with `application...#### Previous behaviour
Steps to reproduce:
1. Do a call to auth-token API with `application/json` mime
2. Crash boom broken
#### New behaviour
Steps to validate that it works:
1. Do a call to auth-token API with `application/json` mime
2. No crash, it works1.13https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/691Fix issue with date and 403 on books page2018-01-31T21:40:28+01:00Sébastiaan VersteegFix issue with date and 403 on books page#### Previous behaviour
Steps to reproduce:
1. Have a membership after today
2. Boom, crash, everything went wrong
#### New behaviour
Steps to validate that it works:
1. Have a membership after today
2. Works.#### Previous behaviour
Steps to reproduce:
1. Have a membership after today
2. Boom, crash, everything went wrong
#### New behaviour
Steps to validate that it works:
1. Have a membership after today
2. Works.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/692Fix missing field in admin for partner events2018-01-31T21:40:30+01:00Sébastiaan VersteegFix missing field in admin for partner events#### Previous behaviour
Steps to reproduce:
1. Try to create a partner event without partner
2. Can't save because field is missing
#### New behaviour
Steps to validate that it works:
1. Try to create a partner event without partner
2...#### Previous behaviour
Steps to reproduce:
1. Try to create a partner event without partner
2. Can't save because field is missing
#### New behaviour
Steps to validate that it works:
1. Try to create a partner event without partner
2. Workshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/697Fix event cancellation2018-02-01T16:08:19+01:00Thom WiggersFix event cancellationCloses #565
I think this should work, @tvbussel? Closes #565
I think this should work, @tvbussel? Tom van BusselTom van Busselhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/707Allow span with text-decoration by bleach2018-02-12T14:44:32+01:00Sébastiaan VersteegAllow span with text-decoration by bleachCloses #564
#### Previous behaviour
Steps to reproduce:
1. Make an announcement
2. Add underscore styling to text
3. It is stripped out
#### New behaviour
Steps to validate that it works:
1. Make an announcement
2. Add underscore sty...Closes #564
#### Previous behaviour
Steps to reproduce:
1. Make an announcement
2. Add underscore styling to text
3. It is stripped out
#### New behaviour
Steps to validate that it works:
1. Make an announcement
2. Add underscore styling to text
3. It is stripped out1.14https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/713Fix changing the pizza order status using PATCH2018-02-09T14:33:16+01:00Sébastiaan VersteegFix changing the pizza order status using PATCHCloses #567
#### Previous behaviour
Steps to reproduce:
1. Create a pizza event
2. Add orders
3. Change the order status in the pizza frontend admin
4. The user connected to the order changes to _you_, the logged-in user. And ...Closes #567
#### Previous behaviour
Steps to reproduce:
1. Create a pizza event
2. Add orders
3. Change the order status in the pizza frontend admin
4. The user connected to the order changes to _you_, the logged-in user. And the paid status changes.
#### New behaviour
Steps to validate that it works:
1. Create a pizza event
2. Add orders
3. Change the order status in the pizza frontend admin
4. The user connected stays the same. The paid status changes.Thom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/714Fix availability of photo albums on the website2018-02-10T13:08:02+01:00Sébastiaan VersteegFix availability of photo albums on the websiteCloses #566
#### Previous behaviour
Steps to reproduce:
1. Create a photo album.
2. You can't open the album and directly opening using the slug doesn't work either.
#### New behaviour
Steps to validate that it works:
1. C...Closes #566
#### Previous behaviour
Steps to reproduce:
1. Create a photo album.
2. You can't open the album and directly opening using the slug doesn't work either.
#### New behaviour
Steps to validate that it works:
1. Create a photo album.
2. Opening the album works and photos are viewable.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/727Suppress unclosed file handle warnings2018-02-14T19:31:31+01:00Thom WiggersSuppress unclosed file handle warningsCloses #589
#### Previous behaviour
Steps to reproduce:
1. Get warnings when running with `python -Wall`
#### New behaviour
Steps to validate that it works:
1. No longer get warnings about unclosed file handles.Closes #589
#### Previous behaviour
Steps to reproduce:
1. Get warnings when running with `python -Wall`
#### New behaviour
Steps to validate that it works:
1. No longer get warnings about unclosed file handles.1.14https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/728Fix other test warnings2018-02-14T19:32:04+01:00Thom WiggersFix other test warningsOne about timezones, the other about a deprecationwarning
#### Previous behaviour
Steps to reproduce:
1. test with warnings enabled, see warnings
#### New behaviour
Steps to validate that it works:
1. test with warnings enabled, see ...One about timezones, the other about a deprecationwarning
#### Previous behaviour
Steps to reproduce:
1. test with warnings enabled, see warnings
#### New behaviour
Steps to validate that it works:
1. test with warnings enabled, see fewer warnings.1.14https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/729Fix event registration saved Dutch message2018-03-10T12:15:25+01:00Joren VranckenFix event registration saved Dutch messageAfter saving registration options in Dutch the following message was shown:
> Je afmelding is succesvol opgeslagen.
"afmelding" should be changed into "aanmelding", because a registration is saved, not a cancellation.After saving registration options in Dutch the following message was shown:
> Je afmelding is succesvol opgeslagen.
"afmelding" should be changed into "aanmelding", because a registration is saved, not a cancellation.1.14https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/732Fix RegistrationInformationfield ordering2018-03-10T12:17:09+01:00Thom WiggersFix RegistrationInformationfield orderingCloses #592
#### Previous behaviour
Steps to reproduce:
1. Observe order is strange
#### New behaviour
Steps to validate that it works:
1. Observe field order is correct
### Bonus change
Makes the exceptions raised b...Closes #592
#### Previous behaviour
Steps to reproduce:
1. Observe order is strange
#### New behaviour
Steps to validate that it works:
1. Observe field order is correct
### Bonus change
Makes the exceptions raised by the `registration_fields` function more specific.1.14Tom van BusselTom van Busselhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/737Fix photos api title field2018-03-10T12:15:02+01:00Sébastiaan VersteegFix photos api title field#### Previous behaviour
Steps to reproduce:
1. The API gives back two fields `title_nl` and `title_en`.
#### New behaviour
Steps to validate that it works:
1. The API gives back one `title` field based on the users language.#### Previous behaviour
Steps to reproduce:
1. The API gives back two fields `title_nl` and `title_en`.
#### New behaviour
Steps to validate that it works:
1. The API gives back one `title` field based on the users language.1.14https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/742Revert "Merge branch 'feature/token-middleware' into 'master'"2018-03-14T13:36:46+01:00Sébastiaan VersteegRevert "Merge branch 'feature/token-middleware' into 'master'"This reverts merge request !738
The functionality causes problems with the SessionAuthentication and DRF.This reverts merge request !738
The functionality causes problems with the SessionAuthentication and DRF.1.14