concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2017-12-27T23:17:52+01:00https://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/621Combine almost-adjacent committee memberships on committee page2018-01-01T18:45:09+01:00Joost Rijneveldjoost@joostrijneveld.nlCombine almost-adjacent committee memberships on committee page/label ~"technical change"
Closes #513
### Short description
Combines almost-adjacent committee memberships on committee page. Previously, small gaps would reset the counter./label ~"technical change"
Closes #513
### Short description
Combines almost-adjacent committee memberships on committee page. Previously, small gaps would reset the counter.1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/608Resize profile images on upload2017-10-17T16:41:34+02:00Gijs HendriksenResize profile images on uploadCloses #529Closes #5291.11https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/603Remove confusing 'cancel' button from registration info fields page2017-12-27T23:19:19+01:00Sébastiaan VersteegRemove confusing 'cancel' button from registration info fields pageCloses #525
### Short description
Remove confusing 'cancel' button from registration info fields pageCloses #525
### Short description
Remove confusing 'cancel' button from registration info fields page1.12https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/593Drop deprecation feed2017-10-10T13:44:04+02:00Thom WiggersDrop deprecation feedGet rid of deprecation feed
### Short description
We've been sending out these announcements long enough, anyone still accessing this Thalia feed must not be reading it anyway.Get rid of deprecation feed
### Short description
We've been sending out these announcements long enough, anyone still accessing this Thalia feed must not be reading it anyway.1.11https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/589Add API endpoint for partner events2017-10-03T16:20:34+02:00Sébastiaan VersteegAdd API endpoint for partner events### Short description
Add API endpoint for partner events
### Why?
The calendar in the app is currently unable to show events organised by partners.
### Steps to use this feature
1. Create a partner
2. Add a partner event
3. Go to `...### Short description
Add API endpoint for partner events
### Why?
The calendar in the app is currently unable to show events organised by partners.
### Steps to use this feature
1. Create a partner
2. Add a partner event
3. Go to `/api/v1/partners/events/`1.11https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/538Add frontpage article announcements2017-08-25T16:15:54+02:00Joost Rijneveldjoost@joostrijneveld.nlAdd frontpage article announcementsCloses #473
### Short description
This basically creates a second announcements-like model that controls news articles for the front page.
### Steps to use this feature
1. Create an object in the admin
2. Look at the front pageCloses #473
### Short description
This basically creates a second announcements-like model that controls news articles for the front page.
### Steps to use this feature
1. Create an object in the admin
2. Look at the front pagehttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/536Updated book list2017-08-22T09:32:05+02:00Gijs HendriksenUpdated book listBook list updated for the first semester courses in 2017-2018, including a new way to display the catalog.Book list updated for the first semester courses in 2017-2018, including a new way to display the catalog.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/531Fix timezone naive warning in events viewset2017-09-12T14:25:34+02:00Sébastiaan VersteegFix timezone naive warning in events viewsetCloses #464
#### Previous behaviour
Steps to reproduce:
1. Run any code and the warning is printed
#### New behaviour
Steps to validate that it works:
1. Run any code and the warning is not printedCloses #464
#### Previous behaviour
Steps to reproduce:
1. Run any code and the warning is printed
#### New behaviour
Steps to validate that it works:
1. Run any code and the warning is not printedhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/508Add html entity unescape functionality to event descriptions in the API2017-06-28T19:54:42+02:00Gijs HendriksenAdd html entity unescape functionality to event descriptions in the APIAangezien het `description` field bij events HTML mag bevatten, kunnen hier ook html entities in zitten, zoals ` `. Deze fix zet deze om naar normale tekens (na het verwijderen van HTML tags), zodat de ThaliApp de beschrijving norma...Aangezien het `description` field bij events HTML mag bevatten, kunnen hier ook html entities in zitten, zoals ` `. Deze fix zet deze om naar normale tekens (na het verwijderen van HTML tags), zodat de ThaliApp de beschrijving normaal kan laten zien.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/492Introducing: API Pagination2017-06-28T19:54:42+02:00Sébastiaan VersteegIntroducing: API Pagination### Short description
Add option for pagination to the Django REST Framework settings.
### Long description
Since we're building the ThaliApp and we're going to have a lot of new features in the future I propose the addition of `LimitO...### Short description
Add option for pagination to the Django REST Framework settings.
### Long description
Since we're building the ThaliApp and we're going to have a lot of new features in the future I propose the addition of `LimitOffsetPagination` as DRT's default pagination implementation so that it can be used if we want to.
### Steps to use this feature
Add `?limit=<number>` to your favourite DRT list route.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/487Fine no longer required for events without registration2017-12-13T12:44:17+01:00Milan van StiphoutFine no longer required for events without registrationThis is now checked only if the event status is REGISTRATION_REQUIRED in the clean() of the model.
Closes #437This is now checked only if the event status is REGISTRATION_REQUIRED in the clean() of the model.
Closes #437https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/456First version of merge request and issue templates2017-04-26T18:57:19+02:00Luuk ScholtenFirst version of merge request and issue templatesCloses #397Closes #397https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/435utils/thumbnails: document thumbnail url usage2017-04-05T21:50:55+02:00Joost Rijneveldjoost@joostrijneveld.nlutils/thumbnails: document thumbnail url usageI had forgotten why we were doing this when reading #378. Perhaps a comment will help in the future.I had forgotten why we were doing this when reading #378. Perhaps a comment will help in the future.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/401Fix user change form after forcing lowercase2017-03-29T20:17:23+02:00Sébastiaan VersteegFix user change form after forcing lowercase@lscholten @wkuipers@lscholten @wkuipershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/380Add filtering and searching to photos admin2017-03-08T22:19:32+01:00Sébastiaan VersteegAdd filtering and searching to photos adminCloses #219Closes #219https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/377Api login handles json post requests2017-12-13T12:44:31+01:00Aucke BosApi login handles json post requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/367Fix cancellation when no users are on the waiting list2017-03-08T20:35:50+01:00Sébastiaan VersteegFix cancellation when no users are on the waiting listTijdens het testen van de fix voor #330 (!365) ontdekte ik dat iemand die wil cancellen zonder dat er iemand op de wachtlijst een error krijgt. Want de index om de eerste persoon op de wachtlijst te vinden bestaat natuurlijk niet.
Waaro...Tijdens het testen van de fix voor #330 (!365) ontdekte ik dat iemand die wil cancellen zonder dat er iemand op de wachtlijst een error krijgt. Want de index om de eerste persoon op de wachtlijst te vinden bestaat natuurlijk niet.
Waarom niet vraag je je af? Nou, omdat er `>=` stond in plaats van `>`. Wat is hier niet goed aan? Als het aantal registraties gelijk is aan het maximale aantal dan wordt er nog steeds een poging gedaan om de e-mail te versturen. En dat klopt natuurlijk niet, want die mail moet verzonden worden als er méér mensen zijn dan maximaal kan. En de persoon die op de cancel knop drukt is natuurlijk nog niet van die lijst mensen afgehaald dus die moet worden meegenomen in de vergelijking.
Hoe kom je de issue tegen:
1. Maak een event met max participants 3.
2. Meld 2 mensen aan.
3. Meld jezelf aan.
4. Probeer je af te melden.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/350Improved Thabloid save function2017-03-08T20:35:51+01:00Gijs HendriksenImproved Thabloid save functionCloses #114Closes #114https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/335Enforce committee membership enddates in the past2017-02-09T08:26:59+01:00Joost Rijneveldjoost@joostrijneveld.nlEnforce committee membership enddates in the pastCloses #284Closes #284