1. 06 Sep, 2016 6 commits
  2. 05 Sep, 2016 5 commits
    • Thom Wiggers's avatar
      Merge branch 'mentors' into 'master' · 8ad68bee
      Thom Wiggers authored
      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
    • Joost Rijneveld's avatar
      Add model for mentors · 6d2c9564
      Joost Rijneveld authored
      They are not well fit in the committee model, and are necessary
      when we migrate members.
    • Sébastiaan Versteeg's avatar
      Merge branch 'feature/24-newsletter' into 'master' · 2cf9e993
      Sébastiaan Versteeg authored
      Newsletter integration
      Closes #24. Also fixes #66
      See merge request !60
    • Thom Wiggers's avatar
      Fix some small translation issues · a1d4f185
      Thom Wiggers authored
    • Sébastiaan Versteeg's avatar
      Add newsletter app · 0f7450bb
      Sébastiaan Versteeg authored
      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
  3. 04 Sep, 2016 1 commit
  4. 31 Aug, 2016 4 commits
  5. 29 Aug, 2016 13 commits
  6. 28 Aug, 2016 11 commits