concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2018-05-16T20:02:15+02:00https://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/795Add search filter to photos api2018-05-16T20:04:04+02:00Sébastiaan VersteegAdd search filter to photos apiCloses no issue
### Short description
Add search filter to photos api
### Steps to use this feature
1. Open the photos API
2. Add a search query to the request
3. ProfitCloses no issue
### Short description
Add search filter to photos api
### Steps to use this feature
1. Open the photos API
2. Add a search query to the request
3. Profit1.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/790Disable pipconflictchecker and include a check if the requirements are up to ...2018-05-16T19:02:36+02:00Thom WiggersDisable pipconflictchecker and include a check if the requirements are up to date into CI.### Short description
* Disable pipconflictchecker: #631
* Include `safety check` to check if our deps are somewhat up to date### Short description
* Disable pipconflictchecker: #631
* Include `safety check` to check if our deps are somewhat up to date1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/789Resolve "Improve statistics"2018-05-16T19:36:14+02:00Luko van der MaasResolve "Improve statistics"### Short description
Added statistics for total pizza orders and current pizza orders
### Steps to use this feature
1. Add 2 pizza events
2. Add pizza's to both events
3. look at the statistics page of Thalia.nu
4. Accurate statistics...### Short description
Added statistics for total pizza orders and current pizza orders
### Steps to use this feature
1. Add 2 pizza events
2. Add pizza's to both events
3. look at the statistics page of Thalia.nu
4. Accurate statistics should be shown.1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/788Add committee roles to overview page2018-05-16T19:02:34+02:00Sébastiaan VersteegAdd committee roles to overview pageCloses #604
### Short description
Add committee roles to overview page
### Steps to use this feature
1. Check the committee pagesCloses #604
### Short description
Add committee roles to overview page
### Steps to use this feature
1. Check the committee pages1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/787Improve usability by adding explanation about existing accounts2018-05-16T19:02:37+02:00Sébastiaan VersteegImprove usability by adding explanation about existing accountsCloses #608
### Short description
Improve usability by adding explanation about existing accountsCloses #608
### Short description
Improve usability by adding explanation about existing accounts1.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.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/781Build and test container in CI2018-05-16T19:02:33+02:00Thom WiggersBuild and test container in CICloses #613
### Short description
* Build the docker container in CI
* Build release containers in CI
* Change release scriptCloses #613
### Short description
* Build the docker container in CI
* Build release containers in CI
* Change release script1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/780Update Album detail title in API2018-04-05T14:09:12+02:00Sébastiaan VersteegUpdate Album detail title in API1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/778Get mailinglist api secret from env variables2018-03-28T19:45:30+02:00Joren VranckenGet mailinglist api secret from env variablesAs discussed on slack, it is better to get the mailinglist api secret from the environment variables, because it allows us the easier change the secret.
[The serverconfig MR](serverconfig!190)As discussed on slack, it is better to get the mailinglist api secret from the environment variables, because it allows us the easier change the secret.
[The serverconfig MR](serverconfig!190)1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/777Add phone and email links to events registrations overview2018-03-28T20:34:43+02:00Sébastiaan VersteegAdd phone and email links to events registrations overviewCloses #617
### Short description
Add phone and email links to events registrations overview
### Steps to use this feature
1. Go to an event's registrations admin overview
![Screen_Shot_2018-03-28_at_20.21.47](/uploads/3bf...Closes #617
### Short description
Add phone and email links to events registrations overview
### Steps to use this feature
1. Go to an event's registrations admin overview
![Screen_Shot_2018-03-28_at_20.21.47](/uploads/3bf2c168d56de15829e93b217b14bae6/Screen_Shot_2018-03-28_at_20.21.47.png)1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/776Add sorting to events backend using jQuery tablesorter2018-03-28T19:45:30+02:00Sébastiaan VersteegAdd sorting to events backend using jQuery tablesorterCloses #494
### Short description
Add sorting to events backend using jQuery tablesorter
### Long description
After a conversation with Kirsten and Jan at the wine tasting I was pointed to the fact that the pizza admin (which...Closes #494
### Short description
Add sorting to events backend using jQuery tablesorter
### Long description
After a conversation with Kirsten and Jan at the wine tasting I was pointed to the fact that the pizza admin (which is built in the frontend) has a jQuery table sorting plugin. So I went on an adventure to see if this would be hard to add to the existing backend. And if it would be better than @ghogewind's solution.
So after some experimentation I found that it was fairly easy, adding some JS and CSS.
Previously I thought that replicating Django's sorting capabilities on our custom pages would be best. However, this is so easy and perfectly re-usable (also if Django makes breaking changes) that I think we should consider this instead.
Also, it doesn't need any changes in the code of the views. And doesn't require reloading the page :p
### Steps to use this feature
1. Open an event's registration page.
2. Click or tap a column header for the column you want to sort by.
3. The table is sorted.1.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/771Resolve "Sort cancellations by cancel date"2018-03-28T19:45:31+02:00Thom WiggersResolve "Sort cancellations by cancel date"Closes #616Closes #6161.15https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/770Resolve "Creating an event without specifying time crashes the request"2018-03-28T19:45:32+02:00Luko van der MaasResolve "Creating an event without specifying time crashes the request"Closes #609
#### Previous behaviour
Steps to reproduce:
1. Create an event with all field filled in except for the time of the start of the event and the end of the event
2. Click save
3. Server crash
#### New behaviour
Ste...Closes #609
#### Previous behaviour
Steps to reproduce:
1. Create an event with all field filled in except for the time of the start of the event and the end of the event
2. Click save
3. Server crash
#### New behaviour
Steps to validate that it works:
1. Create an event with all field filled in except for the time of the start of the event and the end of the event
2. Click save
3. No crash but an error for the user1.15