concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2016-09-06T10:48:27+02:00https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/61Add model for mentors2016-09-06T10:48:27+02:00Joost Rijneveldjoost@joostrijneveld.nlAdd model for mentorsThey are not well fit in the committee model, and are necessary when we migrate members in #33.They are not well fit in the committee model, and are necessary when we migrate members in #33.Thom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/62Mentor achievement on profile (and fixes)2016-09-06T11:00:13+02:00Sébastiaan VersteegMentor achievement on profile (and fixes)Closes #68.
!61 did not have a admin page for the mentor model.
The __str__ gave an error and the model name was plural instead of singular.
And: the mentorship is now shown on the members' profile pages.Closes #68.
!61 did not have a admin page for the mentor model.
The __str__ gave an error and the model name was plural instead of singular.
And: the mentorship is now shown on the members' profile pages.LaunchThom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/63Change committees to activemembers2016-10-05T19:32:54+02:00Sébastiaan VersteegChange committees to activemembersThom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/64Use ID instead of fragile year2016-10-05T19:32:54+02:00Thom WiggersUse ID instead of fragile yearCloses #69Closes #69LaunchSébastiaan VersteegSébastiaan Versteeghttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/65Change board/committee pages2016-10-05T19:32:55+02:00Sébastiaan VersteegChange board/committee pagesCloses #69
- Remove JavaScript usage for the board pages and use indexed urls
- Rename the urls of the committee pages
- Add the board url to the menu
- Replace default committtee placeholder image
- Preserve the i18n fields from...Closes #69
- Remove JavaScript usage for the board pages and use indexed urls
- Rename the urls of the committee pages
- Add the board url to the menu
- Replace default committtee placeholder image
- Preserve the i18n fields from a base class in the translations util
- Fix adding a CommitteeMembership for a board (they were not shown in the list due to the manager being overridden)
- Fix problems when adding/updating a CommitteeMembership of a user that is marked as chair.
- Translatable committee names
- Translatable roles in committeemembershipsThom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/66Add two age filters in the members admin page2016-10-05T19:32:54+02:00Wietse KuipersAdd two age filters in the members admin pageCloses #70Closes #70https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/67Add docker image2016-10-05T19:32:55+02:00Thom WiggersAdd docker imageAdd a docker image.
Zie dit: @lrijneveld, @gmulderAdd a docker image.
Zie dit: @lrijneveld, @gmulderhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/68Style changes part 12016-10-05T19:32:55+02:00Sébastiaan VersteegStyle changes part 1The login page has been styled. And the buttons in the top-right corner are better than ever before. And closes #72.
Soon in a pull request near you: styled password reset pages and more!The login page has been styled. And the buttons in the top-right corner are better than ever before. And closes #72.
Soon in a pull request near you: styled password reset pages and more!Launchhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/69New migration for events model, added a deadline for cancelling your registra...2016-10-05T19:32:55+02:00Gijs HendriksenNew migration for events model, added a deadline for cancelling your registration.Also fixed a small typo in events model.Also fixed a small typo in events model.Gijs HendriksenGijs Hendriksenhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/70Override all registration templates2016-10-05T19:32:55+02:00Sébastiaan VersteegOverride all registration templatesLaunchThom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/71Make events multilingual and translate app strings2016-10-05T19:32:55+02:00Sébastiaan VersteegMake events multilingual and translate app stringsThom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/72Fix style issue on member pages and change ex-members filter2016-10-05T19:32:55+02:00Sébastiaan VersteegFix style issue on member pages and change ex-members filterCloses #32Closes #32https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/73Member profile frontend2016-10-02T18:47:53+02:00Sébastiaan VersteegMember profile frontendCloses #76Closes #76Thom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/74Fix possible error in production2016-10-05T19:32:56+02:00Sébastiaan VersteegFix possible error in productionI was trying the error pages in production and it seems the 'request' key may sometimes be missing. So I suggest we use `get` as a safer way of getting the request.I was trying the error pages in production and it seems the 'request' key may sometimes be missing. So I suggest we use `get` as a safer way of getting the request.Thom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/75Remove 2nd 'members' entry in the menu2016-10-05T19:32:55+02:00Sébastiaan VersteegRemove 2nd 'members' entry in the menuThere were 2. There should be 1.There were 2. There should be 1.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/76Multilingual merchandise and import script2016-10-05T19:32:55+02:00Sébastiaan VersteegMultilingual merchandise and import scriptThom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/77Add /association page2016-10-02T18:47:53+02:00Sébastiaan VersteegAdd /association pageLaunchhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/78Add /for-members page2016-10-02T18:47:54+02:00Sébastiaan VersteegAdd /for-members pageLaunchhttps://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 Martenshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/80Fix photo thumbnail tag usage2016-10-02T18:47:53+02:00Sébastiaan VersteegFix photo thumbnail tag usage`photo` is an instance of the `Photo` object, not an `ImageFieldFile` or the path as a string.`photo` is an instance of the `Photo` object, not an `ImageFieldFile` or the path as a string.Joost Rijneveldjoost@joostrijneveld.nlJoost Rijneveldjoost@joostrijneveld.nl