concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2016-12-14T20:41:26+01:00https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/245Only show active committees that the user is a member of2016-12-14T20:41:26+01:00Sébastiaan VersteegOnly show active committees that the user is a member ofNot sure if this is the best way to do it, but it might work.
Closes #211, #228 and #227Not sure if this is the best way to do it, but it might work.
Closes #211, #228 and #227https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/246Correctly check for overlapping memberships and chairs2016-12-21T22:01:40+01:00Joost Rijneveldjoost@joostrijneveld.nlCorrectly check for overlapping memberships and chairsCloses #232
cc @twiggers die misschien nog even over deze logica wil nadenkenCloses #232
cc @twiggers die misschien nog even over deze logica wil nadenkenThom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/247Fix broken chair migrations2016-12-14T21:03:46+01:00Joost Rijneveldjoost@joostrijneveld.nlFix broken chair migrationsThis silly typo caused errors when members were previously in a committee before becoming its chair.
This is not performed in production, since we've already migrated. Still seemed useful to merge.This silly typo caused errors when members were previously in a committee before becoming its chair.
This is not performed in production, since we've already migrated. Still seemed useful to merge.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/248Merge branch 'fix/agenda-order-newsletter' into 'master'2016-12-11T20:14:35+01:00Luuk ScholtenMerge branch 'fix/agenda-order-newsletter' into 'master'Order newsletter agenda items by date
Closes #221
See merge request !233Order newsletter agenda items by date
Closes #221
See merge request !233https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/250Fix newsletters send permission and change tests to use non-superuser2016-12-14T20:41:26+01:00Sébastiaan VersteegFix newsletters send permission and change tests to use non-superuserCloses #235Closes #235https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/251Enable horizontal filter for permissions m-to-m field2016-12-14T20:41:26+01:00Sébastiaan VersteegEnable horizontal filter for permissions m-to-m fieldVerdomd handig joh.
(Permissies bewerken zoals op backend gebruikersprofielen met twee aparte boxjes voor wat geactiveerd is en wat niet)Verdomd handig joh.
(Permissies bewerken zoals op backend gebruikersprofielen met twee aparte boxjes voor wat geactiveerd is en wat niet)https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/252Fix problem with user mailaddresses when sending a newsletter2016-12-14T20:41:26+01:00Sébastiaan VersteegFix problem with user mailaddresses when sending a newsletterDit lost hoogstwaarschijnlijk #236 op. Aangezien user 'adridg' met de status 'erelid' geen e-mailadres heeft en ik er geen rekening mee had gehouden dat dit mogelijk kon zijn. E-mailadres is blijkbaar ook niet verplicht.
Verklaart all...Dit lost hoogstwaarschijnlijk #236 op. Aangezien user 'adridg' met de status 'erelid' geen e-mailadres heeft en ik er geen rekening mee had gehouden dat dit mogelijk kon zijn. E-mailadres is blijkbaar ook niet verplicht.
Verklaart alleen nog niet waarom t bestuur wel de mail heeft ontvangen, waarschijnlijk omdat ze onder 'engels' vielen?https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/253Add management script to clean emails2016-12-14T20:41:26+01:00Sébastiaan VersteegAdd management script to clean emailsIs dit genoeg?
Closes #241Is dit genoeg?
Closes #241https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/254Add checkbox for the costs warning to newsletter events2016-12-14T20:41:26+01:00Sébastiaan VersteegAdd checkbox for the costs warning to newsletter eventshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/255Sort committee memberships by starting date on profile page2016-12-14T20:41:26+01:00Wietse KuipersSort committee memberships by starting date on profile pageCloses #245Closes #245https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/257Solve migration merge conflict :ambulance:2016-12-14T20:26:43+01:00Wietse KuipersSolve migration merge conflict :ambulance:that can only mean 1 thingthat can only mean 1 thinghttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/258Update leading text for partners2016-12-21T22:01:40+01:00Joost Rijneveldjoost@joostrijneveld.nlUpdate leading text for partnersCloses #248Closes #248https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/259Sort :pizza: list by name2017-02-07T21:40:29+01:00Wietse KuipersSort :pizza: list by name:pizza::pizza:https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/260Fix wrong translation for "Order" in de pizzas module.2016-12-21T22:01:40+01:00Jim DriessenFix wrong translation for "Order" in de pizzas module.Closes #252Closes #252https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/261Fix problems with permissions for old committee members2016-12-21T22:01:40+01:00Sébastiaan VersteegFix problems with permissions for old committee membersCloses #254Closes #254https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/262Change the default language to Dutch2016-12-21T22:01:40+01:00Sébastiaan VersteegChange the default language to DutchCloses #240Closes #240https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/263Extend pizza product admin page and link from front-end2016-12-21T22:01:40+01:00Joost Rijneveldjoost@joostrijneveld.nlExtend pizza product admin page and link from front-endCloses #229Closes #229https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/264Implemented random-as-a-service API2016-12-21T22:01:40+01:00Wietse KuipersImplemented random-as-a-service APICloses #255Closes #255https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/265Add (very) old ical URL to the deprecation feed2016-12-21T22:01:40+01:00Luuk ScholtenAdd (very) old ical URL to the deprecation feedhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/266Prevent error where '*_None' field does not exist2016-12-21T22:01:40+01:00Sébastiaan VersteegPrevent error where '*_None' field does not existCloses #233Closes #233