Commits · eed50c4617f7c8ab93dade97dd8247d593ed1a5a · thalia / concrexit

28 Aug, 2018 9 commits
- Merge branch 'fix/docblocks-specs' into 'master' · eed50c46
  Thom Wiggers authored Aug 28, 2018
```
Make sure docblocks match specs

Closes #675

See merge request !901
```
  eed50c46
- Merge branch 'tc/add-docs-member-emails' into 'master' · 75b58f07
  Thom Wiggers authored Aug 28, 2018
```
Add documentation to membership emails

See merge request !900
```
  75b58f07
- Merge branch 'feature/add-link-to-payment-from-registrations' into 'master' · 567abdf7
  Thom Wiggers authored Aug 28, 2018
```
Add direct link to payment from registrations model admins

Closes #682

See merge request !917
```
  567abdf7
- Merge branch 'fix/registrations-verbose-name' into 'master' · 051b59ae
  Thom Wiggers authored Aug 28, 2018
```
Fix 'registration' verbose name

See merge request !918
```
  051b59ae
- Fix more tests · 03007170
  Sébastiaan Versteeg authored Aug 28, 2018
  
  03007170
- Add docs block · 61408c52
  Sébastiaan Versteeg authored Aug 28, 2018
  
  61408c52
- Fix 'registration' verbose name · ecf74b18
  Sébastiaan Versteeg authored Aug 28, 2018
  
  ecf74b18
- Fix tests · 1ed65b6e
  Sébastiaan Versteeg authored Aug 28, 2018
  
  1ed65b6e
- Add direct link to payment from registrations model admins · 61067070
  Sébastiaan Versteeg authored Aug 28, 2018
  
  61067070
27 Aug, 2018 7 commits
- Merge branch 'fix/rename-notification-cat-partners' into 'master' · 31d1b812
  Joren Vrancken authored Aug 27, 2018
```
Rename the notification category for partners

See merge request !912
```
  31d1b812
- Merge branch 'update_pipfile_lock' into 'master' · aced2209
  Sébastiaan Versteeg authored Aug 27, 2018
```
Update Pipfile.lock

See merge request !910
```
  aced2209
- Merge branch 'only-sphinx-in-production-entrypoint' into 'master' · bc7201fc
  Sébastiaan Versteeg authored Aug 27, 2018
```
Only sphinx in production entrypoint

See merge request !894
```
  bc7201fc
- Rename the notification category for partners · 11fdaa92
  Sébastiaan Versteeg authored Aug 27, 2018
  
  11fdaa92
- Merge branch 'fix/683' into 'master' · 25937476
  Sébastiaan Versteeg authored Aug 27, 2018
```
Fix translation of 'successful'

Closes #683

See merge request !909
```
  25937476
- Make sure docblocks match specs · c87dcb0e
  Sébastiaan Versteeg authored Aug 18, 2018
  
  c87dcb0e
- Merge branch 'py36' into 'master' · c5c66438
  Sébastiaan Versteeg authored Aug 27, 2018
```
Switch to Python 3.6 as runtime python

See merge request !908
```
  c5c66438
24 Aug, 2018 2 commits
- Update Pipfile.lock · d167774d
  Joren Vrancken authored Aug 24, 2018
  
  d167774d
- Fix translation of 'successful' · 7ad87284
  Joren Vrancken authored Aug 24, 2018
  
  7ad87284
20 Aug, 2018 3 commits
- Switch to Python 3.6 as runtime python · 6fb0fccf
  Thom Wiggers authored Aug 20, 2018
  
  6fb0fccf
- Merge branch 'fix/registration-year' into 'master' · 30b26f7f
  Thom Wiggers authored Aug 20, 2018
```
Fix max registration year

See merge request !906
```
  30b26f7f
- Fix max registration year · 41048441
  Sébastiaan Versteeg authored Aug 20, 2018
  
  41048441
19 Aug, 2018 8 commits
- Merge branch 'sponsor_partner' into 'master' · 6a3a87ca
  Thom Wiggers authored Aug 19, 2018
```
Replace 'sponsor' with 'partner'

See merge request !903
```
  6a3a87ca
- Replace 'sponsor' with 'partner' · 1098d5e1
  Joren Vrancken authored Aug 19, 2018
  
  1098d5e1
- Merge branch 'revert-15b5ffe1' into 'master' · 83e87bfa
  Thom Wiggers authored Aug 19, 2018
```
Revert "Merge branch 'no_obsolete' into 'master'"

See merge request !902
```
  83e87bfa
- Merge branch 'update_pipfile' into 'master' · e6ddaa56
  Thom Wiggers authored Aug 19, 2018
```
Update Pipfile.lock

See merge request !905
```
  e6ddaa56
- Merge branch 'registration_trans_fixes' into 'master' · 116cbdbb
  Thom Wiggers authored Aug 19, 2018
```
Uncapitalize two translations for registrations

See merge request !904
```
  116cbdbb
- Update Pipfile.lock · ffacf08c
  Joren Vrancken authored Aug 19, 2018
  
  ffacf08c
- Uncapitalize two translations for registrations · 5bd621ec
  Joren Vrancken authored Aug 19, 2018
  
  5bd621ec
- Revert "Merge branch 'no_obsolete' into 'master'" · d7847126
  Joren Vrancken authored Aug 19, 2018
```
This reverts merge request !893
```
  d7847126
18 Aug, 2018 3 commits
- Add documentation to membership emails · 2c52ac40
  Sébastiaan Versteeg authored Aug 18, 2018
  
  2c52ac40
- Merge branch 'fix/member-email-tests' into 'master' · 0247dfbf
  Joren Vrancken authored Aug 18, 2018
```
Fix automatic membership emails

See merge request !898
```
  0247dfbf
- Merge branch 'fix/registrations-renewal-start-date' into 'master' · 10e834bd
  Joren Vrancken authored Aug 18, 2018
```
Fix renewal since date calculation

See merge request !899
```
  10e834bd
17 Aug, 2018 5 commits
- Adjust tests of registrations to match · 35846c87
  Sébastiaan Versteeg authored Aug 17, 2018
  
  35846c87
- Set since date to previous until date of renewal registration · dab9444f
  Sébastiaan Versteeg authored Aug 17, 2018
  
  dab9444f
- Fix automatic member emails · 4494b6a2
  Sébastiaan Versteeg authored Aug 17, 2018
  
  4494b6a2
- Add tests for automatic membership emails" · 2ff07609
  Sébastiaan Versteeg authored Aug 17, 2018
  
  2ff07609
- Only run sphinx in the production entrypoint · 14d70be7
  Thom Wiggers authored Aug 15, 2018
  
  14d70be7
16 Aug, 2018 3 commits
- Merge branch 'update-book-list' into 'master' · 9dc3542b
  Sébastiaan Versteeg authored Aug 16, 2018
```
Updated book sale page

See merge request !896
```
  9dc3542b
- Updated book sale page · 12ab7d25
  Gijs Hendriksen authored Aug 16, 2018
  
  12ab7d25
- Merge branch 'computer_computing' into 'master' · c958606d
  Sébastiaan Versteeg authored Aug 16, 2018
```
Use correct english names of studies (and translate "Access the Sentry backend")

See merge request !892
```
  c958606d