Commits · 19470781036d3090ce96a84607c30431dbd04d60 · thalia / concrexit

06 Dec, 2016 15 commits
- Merge branch 'fix/committee-boolean-thing' into 'release/1.0.0' · 19470781
  Luuk Scholten authored Dec 06, 2016
```
:fire:fix

See merge request !213
```
  19470781
- :fire:fix · ecbae821
  Wietse Kuipers authored Dec 06, 2016
  
  ecbae821
- Merge branch 'bug/unknown-commitee-join-date' into 'release/1.0.0' · 1afc98fc
  Luuk Scholten authored Dec 06, 2016
```
Fix displaying when join date is unknown

See merge request !211
```
  1afc98fc
- Merge branch 'fix/remove-avatar-js' into 'release/1.0.0' · 93f1aefa
  Luuk Scholten authored Dec 06, 2016
```
Remove weird avatar error replacement JS

See merge request !206
```
  93f1aefa
- Merge branch 'fix/use-thumbnail-member-directory' into 'release/1.0.0' · f6ea2827
  Luuk Scholten authored Dec 06, 2016
```
Use a thumbnail in the member directory

See merge request !207
```
  f6ea2827
- Merge branch '167-migratieproblemen-members' into 'release/1.0.0' · 9aad23c9
  Thom Wiggers authored Dec 06, 2016
```
Do not display nickname or initials as none

Closes #167. Eigenlijk moeten hier unit tests voor komen (#200)

See merge request !212
```
  9aad23c9
- Do not display nickname or initials as none · f7238fbc
  Joost Rijneveld authored Dec 06, 2016
  
  f7238fbc
- Fix displaying when join date is unknown · ba72e87c
  Joost Rijneveld authored Dec 06, 2016
  
  ba72e87c
- Merge branch 'master' into release/1.0.0 · 47042428
  Thom Wiggers authored Dec 06, 2016
  
  47042428
- Set default from email for server messages · 85a6f424
  Thom Wiggers authored Dec 06, 2016
  
  85a6f424
- Crash test dummy · d7061007
  Thom Wiggers authored Dec 06, 2016
  
  d7061007
- Merge branch 'feature/englishify-readme' into 'master' · 3964929a
  Joost Rijneveld authored Dec 06, 2016
```
Translate Dutch parts of the README

See merge request !209
```
  3964929a
- Translate Dutch parts of the README · 414cde01
  Sébastiaan Versteeg authored Dec 06, 2016
  
  414cde01
- Use a thumbnail in the member directory · edab5e6b
  Sébastiaan Versteeg authored Dec 06, 2016
  
  edab5e6b
- Remove weird avatar error replacement JS · 7207872c
  Sébastiaan Versteeg authored Dec 06, 2016
  
  7207872c
05 Dec, 2016 19 commits
- During member migration, check if basename of images contains query string · b6b8b612
  Luuk Scholten authored Dec 05, 2016
  
  b6b8b612
- Make committees active by default during migration · f0cbd8b2
  Luuk Scholten authored Dec 05, 2016
  
  f0cbd8b2
- Fix querybuilder for 'older' members · 9b32c30b
  Luuk Scholten authored Dec 05, 2016
  
  9b32c30b
- Fix migration length for student numbers · 2ce7c2d5
  Luuk Scholten authored Dec 05, 2016
  
  2ce7c2d5
- Merge branch 'fix-event-cancel-500' into 'release/1.0.0' · 254fbd79
  Luuk Scholten authored Dec 05, 2016
```
Fixes 500 for any cancellation

See merge request !205
```
  254fbd79
- Fixes 500 for any cancellation · 3611ac21
  Wietse Kuipers authored Dec 05, 2016
  
  3611ac21
- Merge branch '167-migratieproblemen-members' into 'master' · c6eb6321
  Luuk Scholten authored Dec 05, 2016
```
Member migration: Fix typo in programme and format student numbers

See merge request !201
```
  c6eb6321
- Merge branch 'fix/membership-migration' into 'master' · 274b0ba5
  Luuk Scholten authored Dec 05, 2016
```
Fix migrating non-members, do not give them a membership object

See merge request !204
```
  274b0ba5
- Fix migrating non-members, do not give them a membership object · e089c61a
  Sébastiaan Versteeg authored Dec 05, 2016
  
  e089c61a
- Merge branch 'fix/improve-committees-frontend' into 'master' · 80475368
  Luuk Scholten authored Dec 05, 2016
```
Only show active committees in the frontend overview

Op dit moment worden alle commissies die worden gemigreerd ook meteen getoond op de site omdat er wordt gekeken naar de einddatum. Daar heb ik een vinkje voor toegevoegd die ze actief/niet actief maakt. Dit geeft in geheel ook iets meer controle hierover.

See merge request !195
```
  80475368
- Merge branch 'fix/photos-spacing' into 'master' · 4cec7f6e
  Joost Rijneveld authored Dec 05, 2016
```
Fix bootstrap override regarding gallery

Closes #198 

Zie comment 'Bootstrap being overwriten by tags'

See merge request !203
```
  4cec7f6e
- Fix bootstrap override regarding gallery · 01369dc6
  Sébastiaan Versteeg authored Dec 05, 2016
  
  01369dc6
- Merge branch '195-besturen-migreren-is-redelijk-stuk' into 'master' · d7bff952
  Luuk Scholten authored Dec 05, 2016
```
Also display inactive boards

Closes #195

See merge request !202
```
  d7bff952
- Also display inactive boards · 7d001539
  Joost Rijneveld authored Dec 05, 2016
  
  7d001539
- Only show active committees in the frontend overview · 5247987e
  Sébastiaan Versteeg authored Dec 01, 2016
  
  5247987e
- Fix typo and format student numbers · bbb3b274
  Joost Rijneveld authored Dec 05, 2016
  
  bbb3b274
- Merge branch '189-mailinglist-member-selection' into 'master' · ef325998
  Luuk Scholten authored Dec 05, 2016
```
Add better member selection to mailinglists admin

Closes #189

See merge request !200
```
  ef325998
- Add better member selection to mailinglists admin · 19bbf8e0
  Wietse Kuipers authored Dec 05, 2016
  
  19bbf8e0
- Merge branch 'pizza_migrations' into 'master' · 189b6235
  Sébastiaan Versteeg authored Dec 05, 2016
```
Migrate pizzas from the old website.

See merge request !199
```
  189b6235
04 Dec, 2016 5 commits
- Fix formatting problems (pep8). · 66bd1865
  Jim Driessen authored Dec 04, 2016
  
  66bd1865
- Migrate pizzas from the old website. · e2c0d7c7
  Jim Driessen authored Dec 04, 2016
  
  e2c0d7c7
- Merge branch '190-vanancies-vacancies-bij-plural-vacancy-categories' into 'master' · 33941c7e
  Luuk Scholten authored Dec 04, 2016
```
Fix translating in partners models

Also fix plural of vacancy categories

Closes #190

See merge request !196
```
  33941c7e
- Merge branch '185-fotoalbums-zijn-stuk-als-shareable-aan-staat' into 'master' · fc30eceb
  Luuk Scholten authored Dec 04, 2016
```
Resolve "fotoalbums zijn stuk als shareable aan staat"

Closes #185

See merge request !198
```
  fc30eceb
- Fix thumbnails for shareable albums · 06f0a2cb
  Joost Rijneveld authored Dec 04, 2016
  
  06f0a2cb
02 Dec, 2016 1 commit
- Merge branch '184-file-size-limit-in-django-nginx' into 'master' · 96ca2f70
  Thom Wiggers authored Dec 02, 2016
```
File size limit in uwsgi

Closes #184

See merge request !197
```
  96ca2f70