GitLab

Add docker image

Add a docker image.

Zie dit: @lrijneveld, @gmulder

See merge request !67

Add two age filters in the members admin page

Closes #70

See merge request !66

Change committees to activemembers



See merge request !63

Merge branch 'master' of gitlab.science.ru.nl:thalia/concrexit into feature/change-committees-to-activemembers

Use ID instead of fragile year

Closes #69

See merge request !64

Mentor 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.

See merge request !62

Squashed commits:
[e05e712] Rename Mentors to Mentorship instead of Mentor
[a694422] Fix PEP
[16ecef4] Add 'mentor achievement' to member profiles
[dd10f23] Fix the string format

Gave an exception when saving the model in the admin
[88717d0] Add admin for the mentor model
[08eb778] Change mentors to mentor (all models are singular)

Add model for mentors

They are not well fit in the committee model, and are necessary when we migrate members in #33.

See merge request !61

They are not well fit in the committee model, and are necessary
when we migrate members.

Newsletter integration

Closes #24. Also fixes #66

See merge request !60

Squashed commits:
[c6cbd24] Remove fuzzy translation
[fd0ec11] Add newsletter app
Squashed commits:
[219ef97] Add newsletter from to settings
[00a2804] Add newsletter app
Squashed commits:
[dc13774[ Fix translations
[26f3bea] Prevent mass deletion from admin and fix add form
[2024827] Rename newsletter_optout to receive_newsletter
[baeb801] Squash migrations
[a8b50e7] Tests for email sending
[1d1f0b1] Move object creation and login to setUp
[3d0fda1] Add tests for newsletters that were not sent
[32e4196] Add more and fix tests
[82e5e6f] Thalia headers on the send page
[0d3b9ad] Send newsletter directly to user in BCC instead of using the mailman list
[8855730] Start writing tests
[8007c19] Add check in model for start and end times
[fbcd91c] Add rendering and sending email code
[507e932] Fix PEP styles
[1432cf0] Use main partner from the partners module
[31708d9] Add newsletter images to static
[299a873] Make frontend preview for newsletter
[e01e3d9] Change end date text
[c5661ba] Make newsletters multilingual
[4dc2579] Add help texts to newsletter fields
[337cf5e] Add introduction field to admin form
[262629b] Add introduction textfield to newsletter
[5a46afd] Re-add CASCADE on delete
[3270015] Add newsletter migrations
[bdb5b96] Add admin for newsletter models
[a613072] Finish models
[2e8946f] Add base files

Make the login page somewhat nicer

Make the login page nicer

See merge request !59

Add django compressor

Closes #63 

Minify and combine all javascript and css files into one. Good for caching, good for speed.

See merge request !56

Fix member-search style

https://www.youtube.com/watch?v=t3otBjVZzT0

See merge request !58

Fix tests error with day



See merge request !57

Remove base-title from template



See merge request !50

Members overview and profile pages

Closes #40 

See merge request !54

Make it possible for a member to be a part of the same committee in different timespans

Voor deze MR werken de committeememberships als volgt:
Een lid kan maar één keer een periode lid zijn (geweest) van een commissie. Daarna kan een lidmaatschap niet meer worden toegevoegd omdat een lid al onderdeel is van de commissie (eigenlijk: was, maar zo werkt de controle niet)

Na deze MR:
- Als een lid op dit moment onderdeel uitmaakt van een commissie dan kan deze niet nog eens worden toegevoegd aan de commissie als de periode van het toe te voegen lidmaatschap eindigt na `now()` (en als deze ervoor ligt dan treedt de volgende regel in werking).
- Als een lid ooit lid was van de commissie in een bepaalde periode dan kan er geen lidmaatschap worden toegevoegd dat overlapt met deze periode.

See merge request !55