concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2017-10-03T16:20:34+02:00https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/546Added extra categories for exam answers2017-10-03T16:20:34+02:00Tom van BusselAdded extra categories for exam answersCloses #387
### Short description
This merge requests adds extra categories for exam answers.
### Steps to use this feature
1. Go to a course
2. Add a new exam
3. Notice that there are extra optionsCloses #387
### Short description
This merge requests adds extra categories for exam answers.
### Steps to use this feature
1. Go to a course
2. Add a new exam
3. Notice that there are extra options1.11https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/760Added extra committee membership filters and an export action2018-03-15T13:22:30+01:00Tom van BusselAdded extra committee membership filters and an export actionCloses #605
### Short description
This MR adds extra filters for committee memberships in the admin and an action for exporting selected memberships to a CSV file.
### Steps to use this feature
1. Go to the committee membership filte...Closes #605
### Short description
This MR adds extra filters for committee memberships in the admin and an action for exporting selected memberships to a CSV file.
### Steps to use this feature
1. Go to the committee membership filters
2. Click on some filters
3. Select all remaining memberships
4. Perform the new export action
5. Download the csv filehttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/272Added .gif files as binary in .gitattributes2016-12-21T22:01:40+01:00Wietse KuipersAdded .gif files as binary in .gitattributeshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1457Added more colors for the statistics page graphs2020-01-08T22:43:26+01:00Luc KnolAdded more colors for the statistics page graphsCloses #982
#### Previous behaviour
Steps to reproduce:
1. There are not enough different colors in the statistics committee chart.
#### New behaviour
Steps to validate that it works:
1. Now there are enough colors, every c...Closes #982
#### Previous behaviour
Steps to reproduce:
1. There are not enough different colors in the statistics committee chart.
#### New behaviour
Steps to validate that it works:
1. Now there are enough colors, every committee now has its own color.30https://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/1062Added Notification When Creating Events2018-11-14T21:54:12+01:00Thijs de JongAdded Notification When Creating EventsCloses #765
### Short description
Added a notification when creating an event, to also fill in the English description box,
even if the event is Dutch only.Closes #765
### Short description
Added a notification when creating an event, to also fill in the English description box,
even if the event is Dutch only.20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1215Added Organiser to Events Page2019-04-12T18:42:12+02:00Thijs de JongAdded Organiser to Events PageCloses #836
Added the Organiser to the events page, with a clickable link linking to the committee/board/society that organises the event.Closes #836
Added the Organiser to the events page, with a clickable link linking to the committee/board/society that organises the event.24https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/575Added pizza API2017-10-03T16:20:34+02:00Gijs HendriksenAdded pizza APICloses #490
### Short description
Introduces an API for the pizzas app.
### Long description
Implements the proposal as described in #490, where the following methods are included in the API:
* `GET /api/v1/pizzas/` to view pizzas (on...Closes #490
### Short description
Introduces an API for the pizzas app.
### Long description
Implements the proposal as described in #490, where the following methods are included in the API:
* `GET /api/v1/pizzas/` to view pizzas (only if there is currently a PizzaEvent or if admin)
* `GET /api/v1/pizzas/event/` to view the current PizzaEvent. This returns a dictionary `{'order': ..., 'event': ...}`, where `event` is the current PizzaEvent and `order` is your current order.
* `GET /api/v1/pizzas/orders/` to view all orders for the current event (only if admin. Also works for non-admins, but they only get to see their own order)
* `GET /api/v1/pizzas/orders/[<id>|me]/` to view a specific order (only if yours or admin)
* `POST /api/v1/pizzas/orders/` to create a new order (with an optional body containing a name, for adding an order for non-members)
* `PUT /api/v1/pizzas/orders/[<id>|me]/` to edit a specific order, with a product id in the body, and (for admins) a paid field in the body (only if yours or admin)
* `DELETE /api/v1/pizzas/orders/[<id>|me]/` to cancel a specific order (only if yours or admin)
### Steps to use this feature
1. Create a PizzaEvent instance.
2. Use `POST` as described above to create an order.
3. Use `GET` to view your order and the event.
4. Use `PUT` to update your order.
5. Use `DELETE` to cancel your order.
6. Note that the features above also work for other people's orders if you are admin.1.11https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/793Added presence and payment status to registration details page2018-05-23T19:22:42+02:00Tom van BusselAdded presence and payment status to registration details pageCloses #628
### Short description
Added a presence indicator to the registration details page.
### Steps to use this feature
1. Create an event which requires a registration.
2. Register for the event.
3. Wait until the ev...Closes #628
### Short description
Added a presence indicator to the registration details page.
### Steps to use this feature
1. Create an event which requires a registration.
2. Register for the event.
3. Wait until the event has begun.
4. Notice that the presence indicator says that you are not present.
5. Set the presence check for your registration.
6. Notice that the presence indicator says that you are present.1.16https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/511Added `profile_description` to the member detail serializer2017-06-28T19:54:43+02:00Gijs HendriksenAdded `profile_description` to the member detail serializerhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1040Added Societies Header on Profiles2018-12-05T20:38:00+01:00Thijs de JongAdded Societies Header on ProfilesCloses #755
### Short description
Added a new header on the profiles, called Societies, for separating the societies from the achievements.Closes #755
### Short description
Added a new header on the profiles, called Societies, for separating the societies from the achievements.20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/933Added Society model2018-10-11T00:50:18+02:00Sébastiaan VersteegAdded Society modelCloses #635
### Short description
Cleaned up the activemembers models structure and added the Society model.
### Steps to use this feature
1. Start
2. Go to /admin
3. See the new society modelCloses #635
### Short description
Cleaned up the activemembers models structure and added the Society model.
### Steps to use this feature
1. Start
2. Go to /admin
3. See the new society model1.18https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/120Added some user feedback to createfixtures2016-10-19T21:43:18+02:00Wietse KuipersAdded some user feedback to createfixturesCalling createfixtures without arguments will silently do nothing which
is very confusingCalling createfixtures without arguments will silently do nothing which
is very confusinghttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/341Added support for uploading albums as tar files2017-02-09T08:26:59+01:00Tom van BusselAdded support for uploading albums as tar filesSupport voor het uploaden van albums als tar files.
Ik heb geprobeerd om code duplicatie zoveel mogelijk te vermijden, maar
de inconsistenties tussen zipfile en tarfile vermoeilijkten dit.
De (oude) code onnodig een mapje aan voor het ni...Support voor het uploaden van albums als tar files.
Ik heb geprobeerd om code duplicatie zoveel mogelijk te vermijden, maar
de inconsistenties tussen zipfile en tarfile vermoeilijkten dit.
De (oude) code onnodig een mapje aan voor het nieuwe album, maar Django
doet dit al automatisch dus ik heb die code verwijderd.
Closes #263https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/797Added terms and conditions to event registrations2018-06-08T19:24:27+02:00Tom van BusselAdded terms and conditions to event registrationsCloses #601
### Short description
This merge request adds terms and conditions to event registrations.
### Steps to use this feature
1. Create event which requires a registration.
2. Go to the event page and wait until the registrat...Closes #601
### Short description
This merge request adds terms and conditions to event registrations.
### Steps to use this feature
1. Create event which requires a registration.
2. Go to the event page and wait until the registrations open.
3. Notice that there is some text reminding you about the terms and conditions above the registration button.
4. Click on the link in this text.
5. Notice that a new tab has opened with the event registration terms and conditions.1.16https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1041Added the ability to edit your profile through the members API2018-12-05T20:39:04+01:00Gijs HendriksenAdded the ability to edit your profile through the members API### Short description
Added the ability to edit your profile through the members API
### Steps to use this feature
1. Send a PATCH request to `http://localhost:8000/api/v1/members/[me|pk]/` with the fields to change in the body.
...### Short description
Added the ability to edit your profile through the members API
### Steps to use this feature
1. Send a PATCH request to `http://localhost:8000/api/v1/members/[me|pk]/` with the fields to change in the body.
2. Notice your profile has been updated updated.20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/1069Added the Possibility To Enter Uppercase Student Number2018-12-05T20:38:04+01:00Thijs de JongAdded the Possibility To Enter Uppercase Student NumberCloses #740
### Short description
Added the Possibility To Enter Uppercase Student Number, instead of only lowercase(s1015438), you can now enter Uppercase(S1015438) as well.Closes #740
### Short description
Added the Possibility To Enter Uppercase Student Number, instead of only lowercase(s1015438), you can now enter Uppercase(S1015438) as well.20https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/836Added token-based personal iCal feed2018-06-13T22:00:46+02:00Gijs HendriksenAdded token-based personal iCal feedCloses #646
### Short description
Adds the option to download a personal iCal feed, which only shows the events you are registered for (and events for which registration is unnecessary).
### Steps to use this feature
1. Go to the `eve...Closes #646
### Short description
Adds the option to download a personal iCal feed, which only shows the events you are registered for (and events for which registration is unnecessary).
### Steps to use this feature
1. Go to the `events` page.
2. Notice there is now another button for an iCal feed, containing a personal token in the URL.1.16Sébastiaan VersteegSébastiaan Versteeghttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/93Add education app2016-10-04T18:22:22+02:00Sébastiaan VersteegAdd education appWeet niet zeker of ik alles heb, maar t lijkt er wel op:
- Course Overview
- View course
- Download exam
- Download summary
- Submit exam
- Submit summary
- Book Sale
En natuurlijk het migratiescript.
I...Weet niet zeker of ik alles heb, maar t lijkt er wel op:
- Course Overview
- View course
- Download exam
- Download summary
- Submit exam
- Submit summary
- Book Sale
En natuurlijk het migratiescript.
Ik heb ook wat aanpassingen gemaakt tegenover de huidige implementatie binnen Concrete5. Zo heb ik de course codes als slugs vervangen door id's. Er wordt namelijk gelinkt naar de vakken als hiervan nog examens/samenvattingen van voorkomen bij andere vakken, en zo is het mogelijk dat, omdat ze kunnen worden hergebruikt, de link naar een heel ander vak gaat.
Closes #6 and #62Launchhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/79Add education migration script2016-10-01T17:21:26+02:00Sébastiaan VersteegAdd education migration scriptDit heeft wel https://gitlab.science.ru.nl/thalia/website/merge_requests/578 nodigDit heeft wel https://gitlab.science.ru.nl/thalia/website/merge_requests/578 nodigJan MartensJan Martens