concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2018-01-17T20:07:24+01:00https://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/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/657Fix migration containing datetime2018-01-14T21:27:38+01:00Sébastiaan VersteegFix migration containing datetimePrevents us from having to generate a new migration over and over again.
I think.
The last 4 migrations are the same, just containing a different date.Prevents us from having to generate a new migration over and over again.
I think.
The last 4 migrations are the same, just containing a different date.1.13Thom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/652Correct usage of django.utils.http.urlquote2018-01-12T13:56:06+01:00Sébastiaan VersteegCorrect usage of django.utils.http.urlquote#### Previous behaviour
Steps to reproduce:
1. The thumbnailer crashes the page (500)
#### New behaviour
Steps to validate that it works:
1. Nothing crashes where thumbnails are used#### Previous behaviour
Steps to reproduce:
1. The thumbnailer crashes the page (500)
#### New behaviour
Steps to validate that it works:
1. Nothing crashes where thumbnails are used1.13https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/655Filter the inline committee memberships2018-01-12T13:53:13+01:00Sébastiaan VersteegFilter the inline committee membershipsCloses #439
#### Previous behaviour
Steps to reproduce:
1. Open the admin page of a committee
2. All former and current members are shown
#### New behaviour
Steps to validate that it works:
1. Open the admin page of a committee
2. O...Closes #439
#### Previous behaviour
Steps to reproduce:
1. Open the admin page of a committee
2. All former and current members are shown
#### New behaviour
Steps to validate that it works:
1. Open the admin page of a committee
2. Only the current members are shown1.13https://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/648Fix issues with the member object in events services2018-01-11T10:27:21+01:00Sébastiaan VersteegFix issues with the member object in events services#### Previous behaviour
Steps to reproduce:
1. Create an event with registration
2. Log out
3. Go to the homepage
#### New behaviour
Steps to validate that it works:
1. Create an event with registration
2. Log out
3. Go to...#### Previous behaviour
Steps to reproduce:
1. Create an event with registration
2. Log out
3. Go to the homepage
#### New behaviour
Steps to validate that it works:
1. Create an event with registration
2. Log out
3. Go to the homepage1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/644Fix registrations services tests2018-01-08T13:21:19+01:00Sébastiaan VersteegFix registrations services tests#### Previous behaviour
Steps to reproduce:
1. Tests failed
#### New behaviour
Steps to validate that it works:
1. Tests do not fail
Closes #553 #### Previous behaviour
Steps to reproduce:
1. Tests failed
#### New behaviour
Steps to validate that it works:
1. Tests do not fail
Closes #553 1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/631Fix careers page ui on mobile2018-01-08T13:19:53+01:00Sébastiaan VersteegFix careers page ui on mobileCloses #440
#### Previous behaviour
Steps to reproduce:
1. Go to the careers page on mobile
2. Notice that the main partner is not shown correctly
#### New behaviour
Steps to validate that it works:
1. Go to the careers page on mobi...Closes #440
#### Previous behaviour
Steps to reproduce:
1. Go to the careers page on mobile
2. Notice that the main partner is not shown correctly
#### New behaviour
Steps to validate that it works:
1. Go to the careers page on mobile
2. Notice that the main partner is shown correctly1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/638Fix missing avatar key in member serializer2018-01-01T19:28:49+01:00Sébastiaan VersteegFix missing avatar key in member serializer#### Previous behaviour
Steps to reproduce:
1. Open the member API
#### New behaviour
Steps to validate that it works:
1. Open the member API#### Previous behaviour
Steps to reproduce:
1. Open the member API
#### New behaviour
Steps to validate that it works:
1. Open the member API1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/616Fix MemberMiddleware in the API2017-12-27T23:18:35+01:00Tom van BusselFix MemberMiddleware in the APICloses no issue.
#### Previous behaviour
Steps to reproduce:
1. `curl -X POST http://127.0.0.1:8000/api/v1/token-auth/ -H 'Content-Type: application/json' -d '{"username": "PUT_USERNAME_HERE", "password": "PUT_PASSWORD_HERE"}'`
2...Closes no issue.
#### Previous behaviour
Steps to reproduce:
1. `curl -X POST http://127.0.0.1:8000/api/v1/token-auth/ -H 'Content-Type: application/json' -d '{"username": "PUT_USERNAME_HERE", "password": "PUT_PASSWORD_HERE"}'`
2. Copy the resulting token
3. `curl -X GET http://127.0.0.1:8000/api/v1/members/me/ -H 'Authorization: Token PUT_TOKEN_HERE'`
4. Notice that the output is empty.
#### New behaviour
Steps to validate that it works:
1. `curl -X POST http://127.0.0.1:8000/api/v1/token-auth/ -H 'Content-Type: application/json' -d '{"username": "PUT_USERNAME_HERE", "password": "PUT_PASSWORD_HERE"}'`
2. Copy the resulting token
3. `curl -X GET http://127.0.0.1:8000/api/v1/members/me/ -H 'Authorization: Token PUT_TOKEN_HERE'`
4. Notice that the output is no longer empty.1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/619Fix push notifications admin search2017-12-27T23:18:32+01:00Sébastiaan VersteegFix push notifications admin searchCloses #540
#### Previous behaviour
Steps to reproduce:
1. Go to the device model pushnotifications admin
2. Enter search term
3. BOOM!
#### New behaviour
Steps to validate that it works:
1. Go to the device model pushnotifications a...Closes #540
#### Previous behaviour
Steps to reproduce:
1. Go to the device model pushnotifications admin
2. Enter search term
3. BOOM!
#### New behaviour
Steps to validate that it works:
1. Go to the device model pushnotifications admin
2. Enter search term
3. Shows results1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/624Fix documents page font2017-12-27T23:18:00+01:00Sébastiaan VersteegFix documents page font#### Previous behaviour
Steps to reproduce:
1. Go to the documents page and note that the font on the thumbnails sucks
#### New behaviour
Steps to validate that it works:
1. Go to the documents page and note that the font on the thumb...#### Previous behaviour
Steps to reproduce:
1. Go to the documents page and note that the font on the thumbnails sucks
#### New behaviour
Steps to validate that it works:
1. Go to the documents page and note that the font on the thumbnails rocks1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/625Hide association documents when unavailable2017-12-27T23:17:56+01:00Tom van BusselHide association documents when unavailableCloses #535
#### Previous behaviour
Steps to reproduce:
1. Add an association document year with only a financial report
2. Go to the documents page
3. Notice that there is a broken link to an annual report, but not to a financial repo...Closes #535
#### Previous behaviour
Steps to reproduce:
1. Add an association document year with only a financial report
2. Go to the documents page
3. Notice that there is a broken link to an annual report, but not to a financial report
#### New behaviour
Steps to validate that it works:
1. Add an association document year with only a financial report
2. Go to the documents page
3. Notice that everything works now1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/626Made the start date a naive when being sent to the admin overview page.2017-12-27T23:17:52+01:00Luko van der MaasMade the start date a naive when being sent to the admin overview page.~bug
Closes #516
#### Previous behaviour
Steps to reproduce:
1. Create an event with a start time after now.
2. Look at the event in /admin/events/event/ and compare the start time with the time in the details page or the nor...~bug
Closes #516
#### Previous behaviour
Steps to reproduce:
1. Create an event with a start time after now.
2. Look at the event in /admin/events/event/ and compare the start time with the time in the details page or the normal detail event page.
3. compare the registration start with the time on the details page.
4. These are different.
#### New behaviour
Steps to validate that it works:
1. Create an event with a start time after now.
2. Look at the event in /admin/events/event/ and compare the start time with the time in the details page or the normal detail event page.
3. compare the registration start with the time on the details page.
4. These are now the same.
1.12Sébastiaan VersteegSébastiaan Versteeghttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/629Use get for dict access in order serializer2017-12-27T23:17:27+01:00Tom van BusselUse get for dict access in order serializerCloses no issue
#### Previous behaviour
Steps to reproduce:
1. Create an order through /api/v1/pizzas/orders without specifying name or member
2. Crash
#### New behaviour
Steps to validate that it works:
1. Create an order through /a...Closes no issue
#### Previous behaviour
Steps to reproduce:
1. Create an order through /api/v1/pizzas/orders without specifying name or member
2. Crash
#### New behaviour
Steps to validate that it works:
1. Create an order through /api/v1/pizzas/orders without specifying name or member
2. It works1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/632Added a check for starting_year and programme_display2017-12-27T23:16:38+01:00Luko van der MaasAdded a check for starting_year and programme_display~bug
Closes #510
#### Previous behaviour
Steps to reproduce:
1. make an account with no cohort or Study programme
2. Cohort and study programme show None
#### New behaviour
Steps to validate that it works:
1. make an account with n...~bug
Closes #510
#### Previous behaviour
Steps to reproduce:
1. make an account with no cohort or Study programme
2. Cohort and study programme show None
#### New behaviour
Steps to validate that it works:
1. make an account with no cohort or Study programme
2. Cohort and study programme don't show1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/639Fix missing context in /me members API call2017-12-27T23:16:37+01:00Sébastiaan VersteegFix missing context in /me members API callCloses #ISSUE
#### Previous behaviour
Steps to reproduce:
1. Go to http://localhost:8000/api/v1/members/me
#### New behaviour
Steps to validate that it works:
1. Go to http://localhost:8000/api/v1/members/meCloses #ISSUE
#### Previous behaviour
Steps to reproduce:
1. Go to http://localhost:8000/api/v1/members/me
#### New behaviour
Steps to validate that it works:
1. Go to http://localhost:8000/api/v1/members/me1.12Tom van BusselTom van Busselhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/637Fix photo uri in events API2017-12-27T23:16:37+01:00Sébastiaan VersteegFix photo uri in events API#### Previous behaviour
Steps to reproduce:
1. Use the events API
2. Problem with the user photo
#### New behaviour
Steps to validate that it works:
1. Use the events API
2. No problem with the user photo#### Previous behaviour
Steps to reproduce:
1. Use the events API
2. Problem with the user photo
#### New behaviour
Steps to validate that it works:
1. Use the events API
2. No problem with the user photo1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/605Fix creating orders for other users using the pizza API2017-11-22T20:41:57+01:00Sébastiaan VersteegFix creating orders for other users using the pizza API#### Previous behaviour
Steps to reproduce:
1. Be an admin and have an active pizza event + products.
2. Create a new order for a user that is not you using the API.
3. The order is created for you.
#### New behaviour
Steps to ...#### Previous behaviour
Steps to reproduce:
1. Be an admin and have an active pizza event + products.
2. Create a new order for a user that is not you using the API.
3. The order is created for you.
#### New behaviour
Steps to validate that it works:
1. Be an admin and have an active pizza event + products.
2. Create a new order for a user that is not you using the API.
3. The order is created for the specified user.1.12