Commits · 162a1017638f28b3ab51432e6bc10cf694ae2786 · thalia / concrexit

03 Oct, 2018 8 commits
- Introduce new base template and design · 162a1017
  Sébastiaan Versteeg authored Oct 03, 2018 and Thom Wiggers committed Oct 03, 2018
  
  162a1017
- Merge branch 'fix/registration-tests' into 'master' · 3ca29495
  Luko van der Maas authored Oct 03, 2018
```
Fix registrations tests

See merge request !968
```
  3ca29495
- Fix registrations tests · f8c2d58a
  Sébastiaan Versteeg authored Oct 03, 2018
  
  f8c2d58a
- Merge branch 'tc/make-studentnumber-required-member-registration' into 'master' · 937a5b1d
  Luko van der Maas authored Oct 03, 2018
```
Make studentnumber required for member registration

See merge request !949
```
  937a5b1d
- Merge branch 'fix/member-profile' into 'master' · 0dcbacf5
  Luko van der Maas authored Oct 03, 2018
```
Fix member achievements in services.py

See merge request !963
```
  0dcbacf5
- Merge branch 'fix/statistics-generator-list' into 'master' · c9173ffa
  Thom Wiggers authored Oct 03, 2018
```
Fix statistics member types input

See merge request !966
```
  c9173ffa
- Merge branch 'benefactors' into 'master' · 20f09a46
  Thom Wiggers authored Oct 03, 2018
```
Change supporters to benefactors in registrations documentation

See merge request !967
```
  20f09a46
- Merge branch 'fix/maps-images' into 'master' · 6e8e1c25
  Luko van der Maas authored Oct 03, 2018
```
Move google maps creation to template tag and add parameters

See merge request !964
```
  6e8e1c25
02 Oct, 2018 1 commit
- Change 'supporter[s]' to 'benefactor[s]' in registrations documentation · 2274e86a
  Joren Vrancken authored Oct 02, 2018
  
  2274e86a
01 Oct, 2018 5 commits
- Merge branch 'feature/more-photos-tests' into 'master' · 6e2b4eb3
  Sébastiaan Versteeg authored Oct 01, 2018
```
Split photos tests and added new tests

See merge request !923
```
  6e2b4eb3
- Fix statistics member types input · 30beda13
  Sébastiaan Versteeg authored Oct 01, 2018
  
  30beda13
- Move google maps creation to template tag and add parameters · cc07adb0
  Sébastiaan Versteeg authored Oct 01, 2018
  
  cc07adb0
- 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
30 Sep, 2018 1 commit
- Fix member achievements in services.py · d7c8e4e5
  Sébastiaan Versteeg authored Sep 30, 2018
  
  d7c8e4e5
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 16 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
- Split photos tests and added new tests · b88388d6
  Tom van Bussel authored Aug 29, 2018
  
  b88388d6
- Make student number required for member registrations · 1ec044fd
  Sébastiaan Versteeg authored Sep 20, 2018
  
  1ec044fd
- 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 thalia/concrexit!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 thalia/concrexit!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 thalia/concrexit!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 thalia/concrexit!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 thalia/concrexit!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 thalia/concrexit!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 thalia/concrexit!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 thalia/concrexit!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