concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2018-01-11T23:47:27+01:00https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/650Fix missing migration2018-01-11T23:47:27+01:00Thom WiggersFix missing migration#### Previous behaviour
Steps to reproduce:
1. CI fails
#### New behaviour
Steps to validate that it works:
1. CI doesn't fail#### Previous behaviour
Steps to reproduce:
1. CI fails
#### New behaviour
Steps to validate that it works:
1. CI doesn't fail1.13https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/765Miscellaneous documents fixes2018-03-20T12:55:59+01:00Tom van BusselMiscellaneous documents fixesCloses #612
Fixes the following:
1. The migrations now hopefully work
2. It's now possible to set `members_only` on minutes
3. It's now possible to make a `GeneralMeeting` without any documents.Closes #612
Fixes the following:
1. The migrations now hopefully work
2. It's now possible to set `members_only` on minutes
3. It's now possible to make a `GeneralMeeting` without any documents.1.14https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/755Fix/documents minutes file2018-03-14T15:42:09+01:00Sébastiaan VersteegFix/documents minutes file#### Previous behaviour
Steps to reproduce:
1. Could not open general meeting in admin
#### New behaviour
Steps to validate that it works:
1. Can open GM in admin#### Previous behaviour
Steps to reproduce:
1. Could not open general meeting in admin
#### New behaviour
Steps to validate that it works:
1. Can open GM in admin1.14https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/754Add failsafes, if no receive_category values are set in the API: enable them all2018-03-14T15:43:19+01:00Sébastiaan VersteegAdd failsafes, if no receive_category values are set in the API: enable them all#### Previous behaviour
Steps to reproduce:
1. Register a new device using the API without setting `receive_category`
2. No categories enabled
#### New behaviour
Steps to validate that it works:
1. Register a new device using the API ...#### Previous behaviour
Steps to reproduce:
1. Register a new device using the API without setting `receive_category`
2. No categories enabled
#### New behaviour
Steps to validate that it works:
1. Register a new device using the API without setting `receive_category`
2. All categories enabled1.14https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/746Fix text alignment on committee detail pages2018-03-14T13:38:01+01:00Sébastiaan VersteegFix text alignment on committee detail pagesRelated to !706Related to !7061.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.14https://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/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/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/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/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/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/796Allow the album cover to return None when the album has no images2018-05-16T20:02:15+02:00Sébastiaan VersteegAllow the album cover to return None when the album has no images#### Previous behaviour
Steps to reproduce:
1. Add an album without photos
2. Open the photos API
#### New behaviour
Steps to validate that it works:
1. Add an album without photos
2. Open the photos API#### Previous behaviour
Steps to reproduce:
1. Add an album without photos
2. Open the photos API
#### New behaviour
Steps to validate that it works:
1. Add an album without photos
2. Open the photos API1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/792Allow event cancellations when member has a fine2018-05-16T19:02:36+02:00Tom van BusselAllow event cancellations when member has a fineCloses #627
#### Previous behaviour
Steps to reproduce:
1. Register for an event
2. Get a fine
3. Can no longer cancel the registration created in step 1.
#### New behaviour
Steps to validate that it works:
1. Register for an event
2...Closes #627
#### Previous behaviour
Steps to reproduce:
1. Register for an event
2. Get a fine
3. Can no longer cancel the registration created in step 1.
#### New behaviour
Steps to validate that it works:
1. Register for an event
2. Get a fine
3. Can still longer cancel the registration created in step 1.1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/791Added   for pizza price2018-05-16T19:02:36+02:00Stan DerksenAdded for pizza price- Added non-breaking space between the €-sign and price to prevent it from breaking to a newline- Added non-breaking space between the €-sign and price to prevent it from breaking to a newline1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/786Fix typo on renewal page2018-05-16T19:02:33+02:00Sébastiaan VersteegFix typo on renewal pageCloses #623Closes #6231.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/785Fix membership renewal page when user has no previous memberships2018-05-16T19:02:35+02:00Sébastiaan VersteegFix membership renewal page when user has no previous membershipsCloses #622
#### Previous behaviour
Steps to reproduce:
1. Create a user without memberships
2. Go to the renewal page
#### New behaviour
Steps to validate that it works:
1. Create a user without memberships
2. Go to the ...Closes #622
#### Previous behaviour
Steps to reproduce:
1. Create a user without memberships
2. Go to the renewal page
#### New behaviour
Steps to validate that it works:
1. Create a user without memberships
2. Go to the renewal page1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/784Only show cohort when cohort is not None2018-04-05T14:07:29+02:00Joren VranckenOnly show cohort when cohort is not NoneCloses #552Closes #5521.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/783Fix link to minutes in meetingyear.html2018-04-05T14:20:03+02:00Sébastiaan VersteegFix link to minutes in meetingyear.htmlCloses #620
#### Previous behaviour
Steps to reproduce:
1. Try to open the minutes of a GM
#### New behaviour
Steps to validate that it works:
1. Try to open the minutes of a GMCloses #620
#### Previous behaviour
Steps to reproduce:
1. Try to open the minutes of a GM
#### New behaviour
Steps to validate that it works:
1. Try to open the minutes of a GM1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/782Translate 'Notulen' in meetingyear.html2018-03-29T15:09:31+02:00Joren VranckenTranslate 'Notulen' in meetingyear.htmlCloses #619Closes #6191.15