Commits · f3e0d555dcdce2b7bdda238fd5becb7b09d951e1 · thalia / concrexit

01 Oct, 2018 2 commits
- Merge branch 'tc/change-mention-of-supporter' into 'master' · f3e0d555
  Sébastiaan Versteeg authored Oct 01, 2018
```
Change all textual mentions of supporter to benefactor

Closes #697

See merge request !960
```
  f3e0d555
- Change all textual mentions of supporter to benefactor · 9f44e25c
  Thijs de Jong authored Oct 01, 2018 and Sébastiaan Versteeg committed Oct 01, 2018
  
  9f44e25c
27 Sep, 2018 5 commits
- Merge branch 'tc/remove-voicemail' into 'master' · 0fac9c0a
  Sébastiaan Versteeg authored Sep 27, 2018
```
Deleted voicemailbox from contactpage

Closes #692

See merge request !962
```
  0fac9c0a
- Merge branch 'tc/remove-voicemail' of gitlab.science.ru.nl:thalia/concrexit... · 3e49a2bb
  Thijs de Jong authored Sep 27, 2018
```
Merge branch 'tc/remove-voicemail' of gitlab.science.ru.nl:thalia/concrexit into tc/remove-voicemail
```
  3e49a2bb
- Deleted voicemailbox from contactpage · 9f83307e
  Thijs de Jong authored Sep 27, 2018
```
Changed Translatios for 'thaliawebsite'.
```
  9f83307e
- Changed Translatios for 'thaliawebsite'. · ad06f399
  Thijs de Jong authored Sep 27, 2018
  
  ad06f399
- Deleted voicemailbox from contactpage · d1341106
  Thijs de Jong authored Sep 27, 2018
  
  d1341106
26 Sep, 2018 14 commits
- Merge branch '708-location-map-at-events-broken' into 'master' · 17bb1d69
  Sébastiaan Versteeg authored Sep 26, 2018
```
Resolve "Location Map at Events broken"

Closes #708

See merge request !961
```
  17bb1d69
- Remove print statement, right settings import · d04ea4c3
  Sébastiaan Versteeg authored Sep 26, 2018
  
  d04ea4c3
- Merge branch '708-location-map-at-events-broken' into 'master' · 7b416607
  Sébastiaan Versteeg authored Sep 26, 2018
```
Resolve "Location Map at Events broken"

Closes #708

See merge request !957
```
  7b416607
- added api key and signature to google maps static map api requests · 46515897
  Luko van der Maas authored Sep 26, 2018
  
  46515897
- Merge branch 'fix/member-email-translation' into 'master' · 3d75b271
  Sébastiaan Versteeg authored Sep 26, 2018
```
Fix Dutch translation in membership notification email incorrect

Closes #686

See merge request !959
```
  3d75b271
- Fix translation of member email · 65fa00a4
  Thijs de Jong authored Sep 26, 2018
  
  65fa00a4
- Merge branch 'tc/update-drf' into 'master' · 3da5d0b0
  Thom Wiggers authored Sep 26, 2018
```
Change list_action detail_action decorators to action to solve DeprecationWarning

Closes #676

See merge request !947
```
  3da5d0b0
- Merge branch 'fix/make-registrations-readonly-on-completed' into 'master' · e2b3889f
  Luko van der Maas authored Sep 26, 2018
```
Make registrations readonly on completed

Closes #690

See merge request !948
```
  e2b3889f
- Merge branch 'fix/two-registrations-one-email-address' into 'master' · 11e098fc
  Thom Wiggers authored Sep 26, 2018
```
Two registrations one email address

Closes #691

See merge request !950
```
  11e098fc
- Merge branch 'feature/old-member-supporter-registration' into 'master' · 631b0c2c
  Thom Wiggers authored Sep 26, 2018
```
Make it possible for previous members to prolong their benefactorship

Closes #684

See merge request !954
```
  631b0c2c
- Merge branch 'fix/cancel-date-sorting-events-admin' into 'master' · 4c972b52
  Thom Wiggers authored Sep 26, 2018
```
Fix registrations table sorting of cancel date

Closes #709

See merge request !955
```
  4c972b52
- Merge branch 'feature/sorting-event-admin' into 'master' · 8da22b99
  Thom Wiggers authored Sep 26, 2018
```
Add sorting to custom columns in event admin

Closes #710

See merge request !956
```
  8da22b99
- Merge branch 'tc/indent-size-html' into 'master' · 8d3cb3be
  Thom Wiggers authored Sep 26, 2018
```
Change HTML indent size to 4

See merge request !953
```
  8d3cb3be
- Merge branch 'push-category-texts' into 'master' · e795e103
  Luko van der Maas authored Sep 26, 2018
```
Fix push notifications categories texts

See merge request !945
```
  e795e103
25 Sep, 2018 2 commits
- Add sorting to custom columns in event admin · 7c529624
  Sébastiaan Versteeg authored Sep 25, 2018
  
  7c529624
- Fix registrations table sorting of cancel date · 80136d14
  Sébastiaan Versteeg authored Sep 25, 2018
  
  80136d14
22 Sep, 2018 2 commits
- Make it possible for previous members to prolong their benefactorship · 2d665e72
  Sébastiaan Versteeg authored Sep 22, 2018
  
  2d665e72
- Change HTML indent size to 4 · d4758b88
  Sébastiaan Versteeg authored Sep 22, 2018
  
  d4758b88
20 Sep, 2018 6 commits
- Add check to model for registrations with same email · 7c8be8d5
  Sébastiaan Versteeg authored Sep 20, 2018
  
  7c8be8d5
- Add tests for two registrations with same email · 5812cf68
  Sébastiaan Versteeg authored Sep 20, 2018
  
  5812cf68
- Fix tests and unreachable code · e5f15219
  Sébastiaan Versteeg authored Sep 20, 2018
  
  e5f15219
- Prevent editing of completed registrations · 96356d3f
  Sébastiaan Versteeg authored Sep 20, 2018
  
  96356d3f
- Change list_route detail_route decorators to action to solve DeprecationWarning · 407db0fb
  Sébastiaan Versteeg authored Sep 20, 2018
  
  407db0fb
- Merge branch 'fix/push-url-blank' into 'master' · c77b1407
  Gijs Hendriksen authored Sep 20, 2018
```
Make url for push messages non-required

See merge request !946
```
  c77b1407
19 Sep, 2018 9 commits
- Make url for push messages non-required · c4bdc69b
  Sébastiaan Versteeg authored Sep 19, 2018
  
  c4bdc69b
- Fix push notifications categories texts · a67a6102
  Sébastiaan Versteeg authored Sep 19, 2018
  
  a67a6102
- Merge branch 'fix-language-in-test' into 'master' · 8938e723
  Thom Wiggers authored Sep 19, 2018
```
Fix tests broken by default language change (#704, !943)

See merge request !944
```
  8938e723
- Fix tests broken by default language change (#704, !943) · 2fb4f739
  Thom Wiggers authored Sep 19, 2018
```
CI Skip maakt meer kapot dan je lief is
```
  2fb4f739
- Merge branch '704-change-default-language-to-english' into 'master' · b5f79730
  Sébastiaan Versteeg authored Sep 19, 2018
```
Resolve "Change default language to English"

Closes #704

See merge request !943
```
  b5f79730
- Merge branch '707-add-descriptions-to-push-notification-categories' into 'master' · 8a11995c
  Thom Wiggers authored Sep 19, 2018
```
Resolve "Add descriptions to push notification categories"

Closes #707

See merge request !942
```
  8a11995c
- Merge branch 'feature/dataminimimalisation' into 'master' · a04fe963
  Thom Wiggers authored Sep 19, 2018
```
Add data minimisation management command

Closes #661

See merge request !935
```
  a04fe963
- added some descriptions · ccb38dfe
  Luko van der Maas authored Sep 19, 2018
  
  ccb38dfe
- Change default language to English · 330399ae
  Thom Wiggers authored Sep 19, 2018
```
[ci skip]
```
  330399ae