concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2016-10-05T19:31:06+02:00https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/91Add code for the homepage2016-10-05T19:31:06+02:00Sébastiaan VersteegAdd code for the homepageIk ging de homepage maken en toen zag ik allemaal javascript. En ik vond javascript niet leuk. Maar toen bedacht ik dat ik wel een templatetag kon maken. Maar die moest dan weer in de events package. En die is dan weer niet gemerged in d...Ik ging de homepage maken en toen zag ik allemaal javascript. En ik vond javascript niet leuk. Maar toen bedacht ik dat ik wel een templatetag kon maken. Maar die moest dan weer in de events package. En die is dan weer niet gemerged in de master. Dus ik heb je branch gebranched en ja dit is het resultaat.
Lang verhaal kort: lees dit hierbovenLaunchhttps://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/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/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/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/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/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/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/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/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/99Administratietrucjes: part 1: create user form.2016-10-05T20:31:52+02:00Thom WiggersAdministratietrucjes: part 1: create user form.Relates to #23 part 1Relates to #23 part 1Launchhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/102Add outline of `migration.md` page2016-10-05T22:08:23+02:00Luuk ScholtenAdd outline of `migration.md` pageCloses #102
Please add to the outline if anything is missingCloses #102
Please add to the outline if anything is missingLaunchhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/85Add createfixtures command to manage.py to create fake user profiles2016-10-05T22:10:16+02:00Jelle Besselingjelle@pingiun.comAdd createfixtures command to manage.py to create fake user profilesExample usage:
`./manage.py createfixtures -u 3`
This will create 3 fake users with usernames, email addresses, profile photos and other miscellaneous information .
Related to #45 Example usage:
`./manage.py createfixtures -u 3`
This will create 3 fake users with usernames, email addresses, profile photos and other miscellaneous information .
Related to #45 https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/94Fix problems with search2016-10-05T22:39:20+02:00Sébastiaan VersteegFix problems with searchCloses #85 and #86Closes #85 and #86Thom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/100Update is_staff when changing committee memberships2016-10-05T22:39:59+02:00Sébastiaan VersteegUpdate is_staff when changing committee membershipsClose #92 Close #92 LaunchThom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/103Resolve "Migrate members"2016-10-05T23:33:33+02:00Joost Rijneveldjoost@joostrijneveld.nlResolve "Migrate members"Closes #33Closes #33