Commits · 189b6235aa784da7115e89a9108ebb9cca390030 · thalia / concrexit

05 Dec, 2016 1 commit
- 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 5 commits
- 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
- enable thunderlock for the hell of it · c61787be
  Thom Wiggers authored Dec 02, 2016
```
https://uwsgi-docs.readthedocs.io/en/latest/articles/SerializingAccept.html
```
  c61787be
- File size limit in uwsgi · 64926e20
  Thom Wiggers authored Dec 02, 2016
  
  64926e20
- Update translations · 92cd1987
  Thom Wiggers authored Dec 02, 2016
  
  92cd1987
- Fix translating in partners models · c15ded8b
  Thom Wiggers authored Dec 02, 2016
```
Also fix plural of vacancy categories (fix #190)
```
  c15ded8b
01 Dec, 2016 1 commit

Merge branch '160-postgres-ci' into 'master' · a9606b5c

Joost Rijneveld authored Dec 01, 2016

Configured CI to use postgres

Closes #160 

Ugly hack in .gitlab-ci.yml and tox.ini is ugly but tox doesn't do conditional dependencies

See merge request !194

a9606b5c

30 Nov, 2016 26 commits
- Merge branch 'fix/logout_path_login_bug' into 'master' · 551fb87c
  Sébastiaan Versteeg authored Nov 30, 2016
```
Fix #191

Closes #191

See merge request !193
```
  551fb87c
- handle .po as binary when merging · 2f4799ec
  Thom Wiggers authored Nov 30, 2016
  
  2f4799ec
- Configured CI to use postgres · a4ebd835
  Wietse Kuipers authored Nov 30, 2016
  
  a4ebd835
- Quick fix · a7113d9c
  Joren Vrancken authored Nov 30, 2016
  
  a7113d9c
- Merge branch 'concrexit-readme-docker' into 'master' · 83deabad
  Thom Wiggers authored Nov 30, 2016
```
README: include Docker instructions

Want docker.

See merge request !192
```
  83deabad
- README: no capital in anchor link to Docker part · 568b057f
  Gerdriaan Mulder authored Nov 30, 2016
  
  568b057f
- Merge branch 'fix/aanmeldingen_aantal_admin_overzicht' into 'master' · dd3e00f8
  Thom Wiggers authored Nov 30, 2016
```
Juist aantal aanmeldingen op admin pagina.

Closes #177

See merge request !191
```
  dd3e00f8
- README: include Docker instructions · 2ea223ae
  Gerdriaan Mulder authored Nov 30, 2016
  
  2ea223ae
- Merge branch '192-ghostscript' into 'master' · df111451
  Thom Wiggers authored Nov 30, 2016
```
Resolve "Ghostscript in Docker"

Closes #192

See merge request !190
```
  df111451
- Fix #177 · 4c42fa17
  Joren Vrancken authored Nov 30, 2016
  
  4c42fa17
- Merge branch 'fix/committee-spacing' into 'master' · df4b888b
  Thom Wiggers authored Nov 30, 2016
```
Fix spacing using 'first-child' class

Closes #163

See merge request !184
```
  df4b888b
- Merge branch 'fix/download-albums' into 'master' · 2d15b677
  Thom Wiggers authored Nov 30, 2016
```
Fix album download button

Closes #187 

See merge request !188
```
  2d15b677
- Merge branch 'fix/gm-migration' into 'master' · cafd1588
  Thom Wiggers authored Nov 30, 2016
```
Fix migrations for 2016 general meetings

Closes #175

See merge request !185
```
  cafd1588
- Fix #192 : include ghostscript · 6ad12432
  Thom Wiggers authored Nov 30, 2016
  
  6ad12432
- Merge branch 'add-doc-events' into 'master' · 75399a18
  Joren Vrancken authored Nov 30, 2016
```
Add comment to is_late_cancellation

See merge request !189
```
  75399a18
- Add documentation to is_late_cancellation · e08b3894
  Sébastiaan Versteeg authored Nov 30, 2016
  
  e08b3894
- Merge branch 'fix/migrate_events_cancel' into 'master' · f3870be6
  Sébastiaan Versteeg authored Nov 30, 2016
```
Fix canceldate not being migrated correctly

Closes #178

See merge request !186
```
  f3870be6
- Merge branch '43-thabloid-viewer' into 'master' · fc682450
  Sébastiaan Versteeg authored Nov 30, 2016
```
Resolve "Display Thabloid pages in a fancy Javascript viewer"

Closes #43

See merge request !187
```
  fc682450
- Fix album download button · 35c0e4b9
  Sébastiaan Versteeg authored Nov 30, 2016
  
  35c0e4b9
- Replaced url by template tag · f088891f
  Gijs Hendriksen authored Nov 30, 2016
  
  f088891f
- Fix build · f2794ce5
  Joren Vrancken authored Nov 30, 2016
  
  f2794ce5
- Fix canceldate not being migrated correctly · b4eb7526
  Joren Vrancken authored Nov 30, 2016
  
  b4eb7526
- Created a Thabloid page viewer using FancyBox · 1ce354ab
  Gijs Hendriksen authored Nov 30, 2016
  
  1ce354ab
- Fix migrations for 2016 general meetings · 7b13d654
  Sébastiaan Versteeg authored Nov 30, 2016
  
  7b13d654
- Fix spacing using 'first-child' class · 4e462187
  Sébastiaan Versteeg authored Nov 30, 2016
  
  4e462187
- Merge branch '157-constraints-nickname' into 'master' · ce78087e
  Sébastiaan Versteeg authored Nov 30, 2016
```
Check if nickname is set before saving preference

See #157

See merge request !183
```
  ce78087e
29 Nov, 2016 2 commits
- Check if nickname is set before saving preference · c7f5ba58
  Thom Wiggers authored Nov 29, 2016
```
See #157
```
  c7f5ba58
- Merge branch 'feature/138-events-for-pizza' into 'master' · 5420e848
  Thom Wiggers authored Nov 29, 2016
```
Limit possible events for pizzas to future or today

Closes #138

See merge request !178
```
  5420e848