Commits · 2df5bfa3bd3d211f15729ff7a8a9b73bdca4ca1e · thalia / concrexit

07 Feb, 2019 2 commits
- Merge branch 'postgres_version' into 'master' · 2df5bfa3
  Sébastiaan Versteeg authored Feb 07, 2019
```
Set postgres version in docker-compose.yml

See merge request !1151
```
  2df5bfa3
- Set postgres version in docker-compose.yml · c159effb
  Joren Vrancken authored Feb 07, 2019
  
  c159effb
06 Feb, 2019 8 commits
- Merge branch... · ba5fa057
  Sébastiaan Versteeg authored Feb 06, 2019
```
Merge branch '478-add-booleanfield-that-toggles-public-display-of-membergroup-members' into 'master'

Add 'Display members' field for MemberGroup

Closes #478

See merge request !1150
```
  ba5fa057
- Merge branch 'python37' into 'master' · 3488d043
  Joren Vrancken authored Feb 06, 2019
```
Use Python 3.7 for Docker builds

See merge request !1148
```
  3488d043
- Add 'Display members' field for MemberGroup · 97ba3353
  Tobias van der Werff authored Feb 06, 2019
  
  97ba3353
- Use Python 3.7 for Docker builds · 3d337ee8
  Sébastiaan Versteeg authored Feb 06, 2019
  
  3d337ee8
- Merge branch 'tc/benefactor-model-value' into 'master' · 1ed4e9dc
  Luko van der Maas authored Feb 06, 2019
```
Replace 'supporter' value in Membership model by 'benefactor'

Closes #712

See merge request !1141
```
  1ed4e9dc
- Merge branch 'feature/address-country' into 'master' · 6f91940f
  Luko van der Maas authored Feb 06, 2019
```
Add country field to user profiles

Closes #810

See merge request !1140
```
  6f91940f
- Merge branch 'feature/payments-wire-payment' into 'master' · e8a43b4f
  Luko van der Maas authored Feb 06, 2019
```
Add wire payment type to payments app

Closes #813

See merge request !1145
```
  e8a43b4f
- Merge branch 'tc/event-payments-connection' into 'master' · 75501213
  Luko van der Maas authored Feb 06, 2019
```
Events payments refactor

See merge request !1112
```
  75501213
04 Feb, 2019 1 commit
- Add wire payment type to payments app · 32e065bb
  Sébastiaan Versteeg authored Feb 04, 2019
  
  32e065bb
31 Jan, 2019 6 commits
- Change code to accomodate new serializers · fc5079f0
  Sébastiaan Versteeg authored Jan 24, 2019
  
  fc5079f0
- Fix saving new payment · fc7df1ef
  Sébastiaan Versteeg authored Dec 28, 2018
  
  fc7df1ef
- Use Payment object to register event payments · f837d414
  Sébastiaan Versteeg authored Dec 28, 2018
  
  f837d414
- Replace supporter database value by benefactor · f59e7c60
  Sébastiaan Versteeg authored Jan 25, 2019
  
  f59e7c60
- Add country field to user profiles · 068d974b
  Sébastiaan Versteeg authored Jan 24, 2019
  
  068d974b
- Merge branch 'fix/conscribosync-entity' into 'master' · 23b79eb4
  Thom Wiggers authored Jan 31, 2019
```
Fix all entityType values of conscribosync

See merge request !1142
```
  23b79eb4
30 Jan, 2019 3 commits
- Merge branch 'dont_cascade_user_deletion_into_education' into 'master' · 67ac1f09
  Sébastiaan Versteeg authored Jan 30, 2019
```
Don't cascade user deletion into deletion of exams etc

See merge request !1144
```
  67ac1f09
- Don't cascade user deletion into deletion of exams etc · 227a7195
  Thom Wiggers authored Jan 30, 2019
  
  227a7195
- Merge branch 'tc/unified-tablesorter' into 'master' · 51ad8b26
  Thom Wiggers authored Jan 30, 2019
```
Unify used tablesorter plugins

Closes #804

See merge request !1143
```
  51ad8b26
26 Jan, 2019 1 commit
- Unify used tablesorter plugins · 34b16e34
  Sébastiaan Versteeg authored Jan 26, 2019
  
  34b16e34
25 Jan, 2019 1 commit
- Fix all entityType values of conscribosync · e08f198f
  Sébastiaan Versteeg authored Jan 25, 2019
  
  e08f198f
24 Jan, 2019 6 commits
- Merge branch 'download_thabloid' into 'master' · bfb80381
  Sébastiaan Versteeg authored Jan 24, 2019
```
Set download attribute on Thabloid download links

See merge request !1138
```
  bfb80381
- Merge branch 'misc_documents' into 'master' · 12f0b3bc
  Sébastiaan Versteeg authored Jan 24, 2019
```
Remove miscellaneous from top of documents page

See merge request !1139
```
  12f0b3bc
- Remove miscellaneous from top of documents page · 1eec5de9
  Joren Vrancken authored Jan 24, 2019
  
  1eec5de9
- Set download attribute on Thabloid download links · 78f47c75
  Joren Vrancken authored Jan 24, 2019
  
  78f47c75
- Merge branch 'fix/conscribo-sync' into 'master' · cc34c33f
  Joren Vrancken authored Jan 24, 2019
```
Set right entity type in conscribo sync

See merge request !1137
```
  cc34c33f
- Set right entity type · d079c639
  Sébastiaan Versteeg authored Jan 24, 2019
  
  d079c639
23 Jan, 2019 12 commits
- Merge branch 'feature/concrexit-sync' into 'master' · d7cd56e3
  Joren Vrancken authored Jan 23, 2019
```
Conscribo member sync

Closes #790

See merge request !1132
```
  d7cd56e3
- Fix initials reference · 3eb3e02d
  Sébastiaan Versteeg authored Jan 23, 2019
  
  3eb3e02d
- Remove dryrun · 6c64d332
  Sébastiaan Versteeg authored Jan 23, 2019
  
  6c64d332
- Use NotImplementedError · d1c61d3b
  Sébastiaan Versteeg authored Jan 23, 2019
  
  d1c61d3b
- Add conscribo settings · c794afa4
  Sébastiaan Versteeg authored Jan 23, 2019
  
  c794afa4
- Merge branch 'fix/events-unpublish' into 'master' · a1fc7165
  Jelle Besseling authored Jan 23, 2019
```
Fix events unpublish

See merge request !1135
```
  a1fc7165
- Merge branch '807-automatic-pizza-save-fix' into 'master' · c895cd49
  Sébastiaan Versteeg authored Jan 23, 2019
```
Automatic pizza save fix

Closes #807

See merge request !1130
```
  c895cd49
- Merge branch 'translate-documents-locatie' into 'master' · d980ceff
  Sébastiaan Versteeg authored Jan 23, 2019
```
Add translation for hardcoded "Locatie"

See merge request !1136
```
  d980ceff
- Merge branch 'fix/remove-notifications-event-delete' into 'master' · 503993f3
  Thijs de Jong authored Jan 23, 2019
```
Remove notifications on event delete

Closes #805

See merge request !1134
```
  503993f3
- Add translation for hardcoded "Locatie" · 05b0b55d
  Jelle Besseling authored Jan 23, 2019
  
  05b0b55d
- Merge branch 'feature/nextcloud-current-board-group' into 'master' · b64a2adf
  Thijs de Jong authored Jan 23, 2019
```
Add special automatic NextCloud group with current board members

See merge request !1129
```
  b64a2adf
- Fix unpublishing event · 5a184bdb
  Sébastiaan Versteeg authored Jan 23, 2019
  
  5a184bdb