Commits · b89f716093d63e7a66285d7b637943d0ff9e0e15 · thalia / concrexit

09 Oct, 2018 3 commits
- Merge branch 'feature/new-template-merchandise' into 'master' · b89f7160
  Thom Wiggers authored Oct 09, 2018
```
Migrate merchandise to new template

Closes #713

See merge request !971
```
  b89f7160
- Migrate merchandise to new template · cc572623
  Sébastiaan Versteeg authored Oct 02, 2018 and Thom Wiggers committed Oct 09, 2018
  
  cc572623
- Merge branch 'new-template-changes' into 'master' · 6ddc3c3f
  Thom Wiggers authored Oct 09, 2018
```
Create constants for thumbnail sizes and make navbar sticky

See merge request !979
```
  6ddc3c3f
05 Oct, 2018 9 commits
- Fix events external registration · 2c55ef0c
  Sébastiaan Versteeg authored Oct 05, 2018
  
  2c55ef0c
- Create constants for thumbnail sizes and make navbar sticky · d750e8c7
  Sébastiaan Versteeg authored Oct 04, 2018
  
  d750e8c7
- Merge branch 'celery_state' into 'master' · 3fcf53fd
  Sébastiaan Versteeg authored Oct 05, 2018
```
Add state database to celery

See merge request !980
```
  3fcf53fd
- Add state database to celery · c1534e4e
  Joren Vrancken authored Oct 04, 2018 and Sébastiaan Versteeg committed Oct 05, 2018
  
  c1534e4e
- Merge branch 'obsolete_translations_thaliawebsite' into 'master' · 67857ec2
  Sébastiaan Versteeg authored Oct 05, 2018
```
Remove obsolete translations

See merge request !981
```
  67857ec2
- Add obsolete translations check to CI · 18dc0355
  Joren Vrancken authored Oct 05, 2018
  
  18dc0355
- Merge branch 'patch-1' into 'master' · 84a17101
  Joren Vrancken authored Oct 05, 2018
```
Force pip install 18.0 in tox.ini

See merge request !982
```
  84a17101
- Remove obsolete translations · f9bd2262
  Joren Vrancken authored Oct 05, 2018
  
  f9bd2262
- Force pip install 18.0 in tox.ini · ee7cc4e3
  Sébastiaan Versteeg authored Oct 05, 2018
  
  ee7cc4e3
04 Oct, 2018 7 commits
- Merge branch 'make_snumber_unique' into 'master' · 333f9055
  Sébastiaan Versteeg authored Oct 04, 2018
```
Make student number unique

See merge request !977
```
  333f9055
- Repair fixtures · f09ccba4
  Thom Wiggers authored Oct 04, 2018 and Sébastiaan Versteeg committed Oct 04, 2018
  
  f09ccba4
- Make s-numbers unique · f23b986f
  Thom Wiggers authored Oct 03, 2018 and Sébastiaan Versteeg committed Oct 04, 2018
  
  f23b986f
- Merge branch 'log-instead-of-print' into 'master' · ed75bd2e
  Sébastiaan Versteeg authored Oct 04, 2018
```
Replace print statements by logging calls

See merge request !978
```
  ed75bd2e
- Replace print statements by logging calls · c74c51cf
  Thom Wiggers authored Oct 04, 2018
  
  c74c51cf
- Merge branch 'feature/revert-registration-status' into 'master' · 5d028ecd
  Thom Wiggers authored Oct 04, 2018
```
Make it possible to correct an acception or rejection in registrations

Closes #679

See merge request !952
```
  5d028ecd
- 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 1 commit
- 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