concrexit merge requestshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests2016-11-09T21:36:45+01:00https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/164Add bleach to events2016-11-09T21:36:45+01:00Joren VranckenAdd bleach to eventsWithout bleach filtering the description text, it is possible for administrators to add any HTML they want to the description.Without bleach filtering the description text, it is possible for administrators to add any HTML they want to the description.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/165Add bleach to the vacancy page for a more readable description2017-05-10T20:45:01+02:00Joren VranckenAdd bleach to the vacancy page for a more readable description@lscholten, je hebt het gezien.@lscholten, je hebt het gezien.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/166Fix deprecation errors by providing app_nam in urls.py2016-11-10T11:30:36+01:00Thom WiggersFix deprecation errors by providing app_nam in urls.pySee
https://docs.djangoproject.com/en/1.10/topics/http/urls/#namespaces-and-includeSee
https://docs.djangoproject.com/en/1.10/topics/http/urls/#namespaces-and-includehttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/167Adds a event_permissions attribute and checks2016-11-16T15:02:37+01:00Wietse KuipersAdds a event_permissions attribute and checksAllows to ban users from attending events in a discrete manner
Closes #144Allows to ban users from attending events in a discrete manner
Closes #144https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/168Add enter2016-11-10T11:34:40+01:00Thom WiggersAdd enterSébastiaan VersteegSébastiaan Versteeghttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/169Add album downloading2016-11-23T19:42:40+01:00Wietse KuipersAdd album downloadingZip files are put in /tmp/ then served with sendfile
Closes #73Zip files are put in /tmp/ then served with sendfile
Closes #73https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/170Revert "Fix translation.py error when saving"2016-11-13T16:03:14+01:00Joost Rijneveldjoost@joostrijneveld.nlRevert "Fix translation.py error when saving"This reverts commit d31edc448cfc9b300b5e408d60e4c4ef6ff37028.
See the discussion in issue #149; this evaluated get_language
when the models were loaded rather than upon rendering the view
Closes #149
This potentially breaks what was ...This reverts commit d31edc448cfc9b300b5e408d60e4c4ef6ff37028.
See the discussion in issue #149; this evaluated get_language
when the models were loaded rather than upon rendering the view
Closes #149
This potentially breaks what was achieved in !126. I gave it a superficial glance and it looked like the migration still works, but perhaps this could do with some more thorough checking.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/171Make url patterns more consistent2016-11-13T20:20:47+01:00Joost Rijneveldjoost@joostrijneveld.nlMake url patterns more consistentCloses #122
This addresses nearly all changes from the proposed urls.csv. However, the changes to the password reset URLs have not been implemented. We currently include `django.contrib.auth.urls` for all URLs related to authentication,...Closes #122
This addresses nearly all changes from the proposed urls.csv. However, the changes to the password reset URLs have not been implemented. We currently include `django.contrib.auth.urls` for all URLs related to authentication, and changing those would require including all of the individual URLs instead. For maintainability, I suggest we maintain the `reset` pattern instead of the (arguably more clear) `reset-password`.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/172Add various missing translations2016-11-16T14:57:08+01:00Joost Rijneveldjoost@joostrijneveld.nlAdd various missing translationsCloses #153Closes #153https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/173Get docker ready for production2016-11-16T21:34:27+01:00Thom WiggersGet docker ready for productionLaunchhttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/174Added a check all as present and paid button2016-11-17T08:05:51+01:00Wietse KuipersAdded a check all as present and paid buttonCloses #89Closes #89https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/175Improve membership migration2016-11-17T08:02:31+01:00Joost Rijneveldjoost@joostrijneveld.nlImprove membership migrationIt's not ideal but it works. (#156)It's not ideal but it works. (#156)https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/176Fix ALLOWED_HOSTS when env var is not set2016-11-17T08:00:10+01:00Joost Rijneveldjoost@joostrijneveld.nlFix ALLOWED_HOSTS when env var is not sethttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/177Import newsletters2016-11-23T20:40:44+01:00Sébastiaan VersteegImport newslettersBasic newsletter importing, not perfect but good enough.
Closes #97 Basic newsletter importing, not perfect but good enough.
Closes #97 https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/178Limit possible events for pizzas to future or today2016-11-29T16:02:47+01:00Sébastiaan VersteegLimit possible events for pizzas to future or todayCloses #138Closes #138Thom WiggersThom Wiggershttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/179Student Participation page2016-11-24T09:19:14+01:00Nienke WesselStudent Participation pageCloses #93Closes #93https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/180Add icons + change template2016-11-24T21:19:31+01:00Joren VranckenAdd icons + change templateZie issue #154.
Getest op Android.Zie issue #154.
Getest op Android.https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/181Sort committees by localized attr names2016-11-24T12:25:16+01:00Joost Rijneveldjoost@joostrijneveld.nlSort committees by localized attr nameshttps://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/182Rename sponsor-logo to topicus-logo2016-11-24T21:20:52+01:00Sébastiaan VersteegRename sponsor-logo to topicus-logoCloses #162Closes #162https://gitlab.science.ru.nl/thalia/concrexit/-/merge_requests/183Check if nickname is set before saving preference2016-11-30T19:17:38+01:00Thom WiggersCheck if nickname is set before saving preferenceSee #157See #157