Commits · 91e2284719792334829c46f0f32dc91dae0f1bdf · thalia / concrexit

04 Oct, 2018 1 commit
- Add option to revert the review in registrations · 91e22847
  Sébastiaan Versteeg authored Oct 03, 2018 and Thom Wiggers committed Oct 04, 2018
  
  91e22847
03 Oct, 2018 19 commits
- Merge branch 'fix/add-googlemaps-production' into 'master' · 4d0d865b
  Luko van der Maas authored Oct 03, 2018
```
Add Google Maps settings to production.py using environment

See merge request !976
```
  4d0d865b
- Add Google Maps settings to production.py using environment · a2fb333d
  Sébastiaan Versteeg authored Oct 03, 2018
  
  a2fb333d
- Merge branch 'feature/add-push-notification-category-descriptions-to-api' into 'master' · 66675cc7
  Sébastiaan Versteeg authored Oct 03, 2018
```
Add push notification category descriptions to the api

See merge request !975
```
  66675cc7
- Add push notification category descriptions to the api · acd9a216
  Gijs Hendriksen authored Oct 03, 2018
  
  acd9a216
- Merge branch 'fix/societies-new-template' into 'master' · 1825af34
  Thijs de Jong authored Oct 03, 2018
```
Fix societies pages

See merge request !974
```
  1825af34
- Fix societies pages · d4c8eb7e
  Sébastiaan Versteeg authored Oct 03, 2018 and Sébastiaan Versteeg committed Oct 03, 2018
  
  d4c8eb7e
- Merge branch 'fix/maps-images' into 'master' · c932ce87
  Sébastiaan Versteeg authored Oct 03, 2018
```
Add the Google Maps url to the events api

See merge request !972
```
  c932ce87
- Add the Google Maps url to the events api · 6ecb419f
  Gijs Hendriksen authored Oct 03, 2018
  
  6ecb419f
- Merge branch 'feature/resend-confirmation-mail' into 'master' · 60a089c3
  Thom Wiggers authored Oct 03, 2018
```
Add resend confirmation email button to admin

Closes #681

See merge request !951
```
  60a089c3
- Add resend confirmation email button to admin · 50bdf5d4
  Sébastiaan Versteeg authored Sep 20, 2018 and Thom Wiggers committed Oct 03, 2018
  
  50bdf5d4
- Merge branch 'feature/new-template' into 'master' · 7934cff3
  Thom Wiggers authored Oct 03, 2018
```
Introduce new base template and design

Closes #714, #137, and #705

See merge request !965
```
  7934cff3
- 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 8 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