concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2018-12-05T20:39:05+01:00https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1065Changed Layout Button2018-12-05T20:39:05+01:00Thijs de JongChanged Layout ButtonCloses #780
#### Previous behaviour
Steps to reproduce:
1. Go to https://thalia.nu/education/courses/72/
2. Look at it not being aligned
#### New behaviour
Steps to validate that it works:
1. Check it on your localhost on bug/button...Closes #780
#### Previous behaviour
Steps to reproduce:
1. Go to https://thalia.nu/education/courses/72/
2. Look at it not being aligned
#### New behaviour
Steps to validate that it works:
1. Check it on your localhost on bug/button-alignment20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1064Fix aspect ratio of membergroup photos2018-12-05T20:39:05+01:00Sébastiaan VersteegFix aspect ratio of membergroup photosCloses #774
#### Previous behaviour
![Screenshot_2018-11-15_at_11.25.43](/uploads/8ae04d86405c19898eb1cae074ee595d/Screenshot_2018-11-15_at_11.25.43.png)
#### New behaviour
![Screenshot_2018-11-15_at_11.32.03](/uploads/04f680f887800...Closes #774
#### Previous behaviour
![Screenshot_2018-11-15_at_11.25.43](/uploads/8ae04d86405c19898eb1cae074ee595d/Screenshot_2018-11-15_at_11.25.43.png)
#### New behaviour
![Screenshot_2018-11-15_at_11.32.03](/uploads/04f680f887800c1f9fc8fa1322a52919/Screenshot_2018-11-15_at_11.32.03.png)20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1059Fix 'older Thabloids' category2018-12-05T20:45:43+01:00Joost Rijneveldjoost@joostrijneveld.nlFix 'older Thabloids' categoryCloses #771
#### Previous behaviour
Steps to reproduce:
1. Click 'older'
2. The page remains empty
#### New behaviour
Steps to validate that it works:
1. Click 'older'
2. See the older ThabloidsCloses #771
#### Previous behaviour
Steps to reproduce:
1. Click 'older'
2. The page remains empty
#### New behaviour
Steps to validate that it works:
1. Click 'older'
2. See the older Thabloids20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1058Fix events javascript to be compressed again2018-12-05T20:38:00+01:00Sébastiaan VersteegFix events javascript to be compressed againCloses no issue
#### Previous behaviour
Steps to reproduce:
1. Events JS not compressed due to errors in new template migration
#### New behaviour
Steps to validate that it works:
1. Compressed again and still working calendar!Closes no issue
#### Previous behaviour
Steps to reproduce:
1. Events JS not compressed due to errors in new template migration
#### New behaviour
Steps to validate that it works:
1. Compressed again and still working calendar!20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1057Remove unused JS from pizzas overview2018-12-05T20:37:59+01:00Sébastiaan VersteegRemove unused JS from pizzas overview20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1056Fix JavaScript on pizzas order page2018-12-05T20:38:04+01:00Sébastiaan VersteegFix JavaScript on pizzas order page#### Previous behaviour
Steps to reproduce:
1. Cannot open pizzas orders page
#### New behaviour
Steps to validate that it works:
1. Can open pizzas orders page#### Previous behaviour
Steps to reproduce:
1. Cannot open pizzas orders page
#### New behaviour
Steps to validate that it works:
1. Can open pizzas orders page20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1051Make member-event combination unique for event registrations2018-12-05T20:39:04+01:00Sébastiaan VersteegMake member-event combination unique for event registrationsCloses #487
#### Previous behaviour
Steps to reproduce:
1. Possible to have two registrations for one user-event combo
#### New behaviour
Steps to validate that it works:
1. Possible to have only one registration for one us...Closes #487
#### Previous behaviour
Steps to reproduce:
1. Possible to have two registrations for one user-event combo
#### New behaviour
Steps to validate that it works:
1. Possible to have only one registration for one user-event combo20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1037Improve vacancy validation2018-12-05T20:38:02+01:00Tom van BusselImprove vacancy validationCloses #761
### Short description
The description is now required, and either a partner or both the company logo are now required.Closes #761
### Short description
The description is now required, and either a partner or both the company logo are now required.20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1030Change events admin urls2018-12-05T20:39:07+01:00Sébastiaan VersteegChange events admin urlsCloses #759 and #785
### Short description
Change the url schemes for our custom event admin views by using the `ModelAdmin` override.
Also removes the custom url API by adding admin functionality to the registrations api.
Closes #759 and #785
### Short description
Change the url schemes for our custom event admin views by using the `ModelAdmin` override.
Also removes the custom url API by adding admin functionality to the registrations api.
20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/899Fix renewal since date calculation2019-09-04T13:04:48+02:00Sébastiaan VersteegFix renewal since date calculationFix renewal since date calculation
#### Previous behaviour
Steps to reproduce:
1. Create renewal and process it
2. Notice that the new since date is until + 1. So 1 day of membership is missing. (until 1 sept + 1 day = 2 sept which sho...Fix renewal since date calculation
#### Previous behaviour
Steps to reproduce:
1. Create renewal and process it
2. Notice that the new since date is until + 1. So 1 day of membership is missing. (until 1 sept + 1 day = 2 sept which should be 1 sept)
#### New behaviour
Steps to validate that it works:
1. Create renewal
2. Notice that the new since date is equal to until.1.16.3https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/898Fix automatic membership emails2018-08-18T13:54:16+02:00Sébastiaan VersteegFix automatic membership emails#### Previous behaviour
Steps to reproduce:
1. Send automatic membership emails
#### New behaviour
Steps to validate that it works:
1. Send automatic membership emails#### Previous behaviour
Steps to reproduce:
1. Send automatic membership emails
#### New behaviour
Steps to validate that it works:
1. Send automatic membership emails1.16.3https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/891Fix language override2018-08-17T11:01:51+02:00Thom WiggersFix language overrideCloses #674
#### Previous behaviour
Steps to reproduce:
1. Run script
2. Observe crash
#### New behaviour
Steps to validate that it works:
1. Run script
2. See it works
### Current status
* [x] TestedCloses #674
#### Previous behaviour
Steps to reproduce:
1. Run script
2. Observe crash
#### New behaviour
Steps to validate that it works:
1. Run script
2. See it works
### Current status
* [x] Tested1.16.2https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/872Fix pizzas uniqueness2018-08-09T16:50:55+02:00Sébastiaan VersteegFix pizzas uniquenessCloses #668
#### Previous behaviour
Steps to reproduce:
1. Create a pizza event
2. Try to edit it
#### New behaviour
Steps to validate that it works:
1. Create a pizza event
2. Try to edit itCloses #668
#### Previous behaviour
Steps to reproduce:
1. Create a pizza event
2. Try to edit it
#### New behaviour
Steps to validate that it works:
1. Create a pizza event
2. Try to edit it1.16.2https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/868Fix/registrations form entry missing2018-08-08T10:34:17+02:00Sébastiaan VersteegFix/registrations form entry missingCloses #664
#### Previous behaviour
Steps to reproduce:
1. Do not enter a value in the starting year field of the registration form
2. Submit
#### New behaviour
Steps to validate that it works:
1. Do not enter a value in the startin...Closes #664
#### Previous behaviour
Steps to reproduce:
1. Do not enter a value in the starting year field of the registration form
2. Submit
#### New behaviour
Steps to validate that it works:
1. Do not enter a value in the starting year field of the registration form
2. Submit1.16.2https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/867Crash on confirming non-existing registration entry2018-08-07T12:34:00+02:00Sébastiaan VersteegCrash on confirming non-existing registration entryCloses #665
#### Previous behaviour
Steps to reproduce:
1. Go to `/registration/confirm-email/00000000-0000-0000-0000-000000000000`
2. :boom:
#### New behaviour
Steps to validate that it works:
1. Go to `/registration/confirm-email/0...Closes #665
#### Previous behaviour
Steps to reproduce:
1. Go to `/registration/confirm-email/00000000-0000-0000-0000-000000000000`
2. :boom:
#### New behaviour
Steps to validate that it works:
1. Go to `/registration/confirm-email/00000000-0000-0000-0000-000000000000`
2. Redirect to registration page1.16.2https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/837Disallow cancellation after event start2018-06-13T22:00:47+02:00Sébastiaan VersteegDisallow cancellation after event start#### Previous behaviour
Steps to reproduce:
1. Register for event
2. Forward to time after start of event
3. Can still cancel 'after deadline'
#### New behaviour
Steps to validate that it works:
1. Register for event
2. Forward to ti...#### Previous behaviour
Steps to reproduce:
1. Register for event
2. Forward to time after start of event
3. Can still cancel 'after deadline'
#### New behaviour
Steps to validate that it works:
1. Register for event
2. Forward to time after start of event
3. Cannot cancel anymore1.16https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/832Fix push notification registration request2018-06-13T19:56:37+02:00Sébastiaan VersteegFix push notification registration requestCloses https://gitlab.science.ru.nl/thalia/ThaliApp/issues/63
#### Previous behaviour
Steps to reproduce:
1. Login using the app
2. Notice no new devices
#### New behaviour
Steps to validate that it works:
1. Login using the app
2. N...Closes https://gitlab.science.ru.nl/thalia/ThaliApp/issues/63
#### Previous behaviour
Steps to reproduce:
1. Login using the app
2. Notice no new devices
#### New behaviour
Steps to validate that it works:
1. Login using the app
2. Notice no new devices1.16https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/824Never import thaliawebsite.settings directly2018-05-31T16:36:50+02:00Thom WiggersNever import thaliawebsite.settings directly### Short description
You should never import `thaliawebsite.settings` directly, but instead import `django.conf.settings`.
See also !818### Short description
You should never import `thaliawebsite.settings` directly, but instead import `django.conf.settings`.
See also !8181.16Sébastiaan VersteegSébastiaan Versteeghttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/821Fix HTML entities in the event organiser email2018-06-13T19:04:40+02:00Sébastiaan VersteegFix HTML entities in the event organiser emailCloses #625
#### Previous behaviour
Steps to reproduce:
1. Create an event
2. Add registration
3. Enable cancellation emails
4. Cancel registration
#### New behaviour
Steps to validate that it works:
1. Create an event
2. Add regist...Closes #625
#### Previous behaviour
Steps to reproduce:
1. Create an event
2. Add registration
3. Enable cancellation emails
4. Cancel registration
#### New behaviour
Steps to validate that it works:
1. Create an event
2. Add registration
3. Enable cancellation emails
4. Cancel registration1.16https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/820Fix thabloids sizing on load2018-06-13T18:59:45+02:00Sébastiaan VersteegFix thabloids sizing on loadCloses #639
#### Previous behaviour
Steps to reproduce:
1. Load the thabloid page
#### New behaviour
Steps to validate that it works:
1. Load the thabloid pageCloses #639
#### Previous behaviour
Steps to reproduce:
1. Load the thabloid page
#### New behaviour
Steps to validate that it works:
1. Load the thabloid page1.16