Commits · 8f57d9b83bb029bc3ebfc885a63628e8b2f2dd22 · thalia / concrexit

10 Sep, 2017 3 commits
- Merge branch '468-youtube-video-on-sponsor-page' into 'master' · 8f57d9b8
  Joost Rijneveld authored Sep 10, 2017
```
Resolve "Youtube video on sponsor page"

Closes #468

See merge request !535
```
  8f57d9b8
- Merge branch 'feature/mailinglist-json-api' into 'master' · a81b6315
  Joost Rijneveld authored Sep 10, 2017
```
Mailinglist JSON API

Closes #29 and #475

See merge request !545
```
  a81b6315
- mailinglist API: add a clarifying comment · ce074154
  Joost Rijneveld authored Sep 10, 2017
  
  ce074154
06 Sep, 2017 4 commits
- Use TinyMCE4 · ba429c57
  Thom Wiggers authored Sep 06, 2017
  
  ba429c57
- Don't filter youtube embeds with bleach · 7d945fda
  Thom Wiggers authored Aug 16, 2017
```
Allows to embed youtube videos in various places, including partner
pages.

Fixes #468
```
  7d945fda
- Change python formatting · 8d46accf
  Sébastiaan Versteeg authored Jul 05, 2017 and Thom Wiggers committed Sep 06, 2017
  
  8d46accf
- Merge branch 'feature/static-no-member-announcement' into 'master' · a8052126
  Luuk Scholten authored Sep 06, 2017
```
Show static announcement when authenticated user does not have an active membership

Closes #274

See merge request !544
```
  a8052126
04 Sep, 2017 2 commits
- Add intern@ to committee chairs list · 0be008f9
  Sébastiaan Versteeg authored Sep 04, 2017
  
  0be008f9
- Remove old mailing list sync API and add alias support · a2af72cd
  Sébastiaan Versteeg authored Sep 03, 2017
  
  a2af72cd
03 Sep, 2017 4 commits
- Move for loop in mailinglist services to separate function · a22d7bcb
  Sébastiaan Versteeg authored Sep 03, 2017
  
  a22d7bcb
- Add automatic lists for mentors and active members · 4d95e4b8
  Sébastiaan Versteeg authored Sep 03, 2017
  
  4d95e4b8
- Add new JSON API for mailing lists · f12d54e3
  Sébastiaan Versteeg authored Sep 03, 2017
  
  f12d54e3
- Show static announcement when authenticated user does not have an active membership · 6b8617a8
  Sébastiaan Versteeg authored Sep 03, 2017
  
  6b8617a8
02 Sep, 2017 1 commit
- Merge branch '477-filter-on-active-committees-in-admin' into 'master' · f0a67b7c
  Luuk Scholten authored Sep 02, 2017
```
Add filter for 'active' and more display fields to committee admin

Closes #477

See merge request !543
```
  f0a67b7c
01 Sep, 2017 9 commits
- Add filter for 'active' and more display fields to committee admin · 96ff2d5c
  Sébastiaan Versteeg authored Sep 01, 2017
  
  96ff2d5c
- Merge branch 'fix/member-pk-profiles' into 'master' · f93d2ab3
  Joost Rijneveld authored Sep 01, 2017
```
Always use user pk to lookup a user and/or member

Closes #481

See merge request !542
```
  f93d2ab3
- Always use user pk to lookup a user and/or member · 9c1815fd
  Sébastiaan Versteeg authored Sep 01, 2017
  
  9c1815fd
- Merge branch '471-finding-members-by-hidden-nickname-should-not-happen' into 'master' · d77d8866
  Sébastiaan Versteeg authored Sep 01, 2017
```
Only search the member list for nicknames that are actually visible

Closes #471

See merge request !539
```
  d77d8866
- members: only search in nicks when displayed · 07daf104
  Joost Rijneveld authored Aug 24, 2017
  
  07daf104
- Merge branch '469-oud-leden-op-een-na-verdwenen-uit-ledenlijst' into 'master' · d5380dfd
  Sébastiaan Versteeg authored Sep 01, 2017
```
Properly filter former members on member page

Closes #469

See merge request !534
```
  d5380dfd
- members: refactor and test filters · ddf986d4
  Joost Rijneveld authored Aug 16, 2017
  
  ddf986d4
- Merge branch 'fix/require-events-permission-for-api' into 'master' · db99ef1b
  Joost Rijneveld authored Sep 01, 2017
```
Hide fields from events API that are not required if you do not have permission to view them

Closes #458

See merge request !529
```
  db99ef1b
- Clarify 'view' permission · e97ba8a7
  Joost Rijneveld authored Sep 01, 2017
  
  e97ba8a7
30 Aug, 2017 2 commits
- Merge branch 'feature/payment-type-registration' into 'master' · 730f686b
  Joost Rijneveld authored Aug 30, 2017
```
Change paid boolean value for registration to enum field to support registration of pin payments

Closes #457

See merge request !528
```
  730f686b
- Merge branch 'feature/vscode-gitignore' into 'master' · 9f597408
  Joost Rijneveld authored Aug 30, 2017
```
Add .vscode to .gitignore

See merge request !541
```
  9f597408
29 Aug, 2017 1 commit
- Add .vscode to .gitignore · 21a82da2
  Sébastiaan Versteeg authored Aug 29, 2017
  
  21a82da2
25 Aug, 2017 4 commits
- Merge branch 'fix/event-queue-mail-url' into 'master' · 819e8609
  Joost Rijneveld authored Aug 25, 2017
```
Add base url to event queue mail

Closes #456

See merge request !527
```
  819e8609
- Merge branch 'feature/mailinglist-committee-contact' into 'master' · 09a49de8
  Joost Rijneveld authored Aug 25, 2017
```
Add OneToOneField from Committee to MailingList next to contact email string

See merge request !486
```
  09a49de8
- Add test case for committees without any address · e8c1a5f3
  Joost Rijneveld authored Aug 25, 2017
```
This completes the XOR check; either a verbatim address or a list
```
  e8c1a5f3
- Merge branch '473-front-page-announcements' into 'master' · 532099f0
  Thom Wiggers authored Aug 25, 2017
```
Add frontpage article announcements

Closes #473

See merge request !538
```
  532099f0
24 Aug, 2017 1 commit
- announcements: add frontpage articles · e172b567
  Joost Rijneveld authored Aug 24, 2017
  
  e172b567
22 Aug, 2017 1 commit
- Merge branch 'update-book-list' into 'master' · a8252121
  Joost Rijneveld authored Aug 22, 2017
```
Updated book list

See merge request !536
```
  a8252121
21 Aug, 2017 1 commit
- Updated book list · 47d98503
  Gijs Hendriksen authored Aug 21, 2017
  
  47d98503
17 Aug, 2017 2 commits
- Add option to have contact email address as string next to mailing list · 08bccd98
  Sébastiaan Versteeg authored Jul 05, 2017
  
  08bccd98
- Add OneToOneField from Committee to MailingList instead of contact email string · 2d34b6fd
  Sébastiaan Versteeg authored May 19, 2017
  
  2d34b6fd
16 Aug, 2017 5 commits
- Change paid boolean value for registration to enum field to support registration of pin payments · b6c71a5a
  Sébastiaan Versteeg authored Jul 21, 2017
  
  b6c71a5a
- Hide fields from events API that are not required if you do not have permission to view them · 8b0c088a
  Sébastiaan Versteeg authored Jul 21, 2017
  
  8b0c088a
- Merge branch 'feature/103-2-email-expiring-members' into 'master' · e6db9460
  Luuk Scholten authored Aug 16, 2017
```
Administratietrucjes: email expiring members

See merge request !502
```
  e6db9460
- Merge branch 'feature/einddatum_vacature' into 'master' · 225a9533
  Luuk Scholten authored Aug 16, 2017
```
Voeg einddatum toe aan vacatures

Closes #170

See merge request !476
```
  225a9533
- members: properly filter ex members; · a868eb8e
  Joost Rijneveld authored Aug 16, 2017
```
The ex-members tab now only displays:
- legacy users that have no memberships at all
- users that have had a 'member' or 'honorary' membership
  and do not currently have an active membership
```
  a868eb8e