Commits · dfd05e990282d10bda0dd6d5c333243b788fea7d · thalia / concrexit

11 Jan, 2017 9 commits
- Merge branch '271-pizza-cancellation' into 'master' · dfd05e99
  Thom Wiggers authored Jan 11, 2017
```
Make  sure that members cannot cancel or change pizza order when not allowed

Closes #271

See merge request !295
```
  dfd05e99
- Merge branch '269-tentamen-uploaden-jaartal' into 'master' · 38bb8186
  Thom Wiggers authored Jan 11, 2017
```
Improve exam upload form

Closes #269

See merge request !294
```
  38bb8186
- Ensure that pizzas can't be unjustly changed or canceled with POST request · eeaf5ee5
  Luuk Scholten authored Dec 30, 2016
```
Fix #271
```
  eeaf5ee5
- Merge branch 'feature/logo-english' into 'master' · 0f3d586a
  Thom Wiggers authored Jan 11, 2017
```
Translate Thalia logo images

See merge request !300
```
  0f3d586a
- Translate Thalia logo images · 6dab6705
  Sébastiaan Versteeg authored Jan 11, 2017
  
  6dab6705
- Convert year selection in summary form to study years · ccbad61c
  Luuk Scholten authored Jan 11, 2017
  
  ccbad61c
- Speed up CommitteeInline · a60ecdf8
  Thom Wiggers authored Jan 11, 2017
```
Prefetch the users in the CommitteeInline
```
  a60ecdf8
- Fix member uploads of summaries · 50d25b1e
  Luuk Scholten authored Jan 11, 2017
```
Was not possible to upload summaries at all
```
  50d25b1e
- Merge branch 'remove_migrations' into 'master' · 1732593e
  Joost Rijneveld authored Jan 11, 2017
```
Remove old migrations

Closes #266

See merge request !296
```
  1732593e
05 Jan, 2017 2 commits
- Remove migration requirements and docs · cb09e0c2
  Thom Wiggers authored Jan 05, 2017
  
  cb09e0c2
- Remove old migrations · 83d3a342
  Thom Wiggers authored Jan 05, 2017
```
Thanks, you've served us well.

Closes #266
```
  83d3a342
30 Dec, 2016 4 commits
- Merge branch '259-unittest-wiki-api' into 'master' · b4c518a3
  Luuk Scholten authored Dec 30, 2016
```
Resolve "Unittest wiki api"

Closes #259

See merge request !286
```
  b4c518a3
- Hide 'cancel' and 'change' order when pizza is paid or event has ended · 61cb5ed0
  Luuk Scholten authored Dec 30, 2016
  
  61cb5ed0
- Add previous years for upload exam form · 03fbe161
  Luuk Scholten authored Dec 29, 2016
```
Fix #269
```
  03fbe161
- Set today as exam date by default in upload exam form · 799f12e5
  Luuk Scholten authored Dec 29, 2016
  
  799f12e5
29 Dec, 2016 3 commits
- Merge branch '173-view-on-site-is-stuk-in-partners-vacancies' into 'master' · f768a077
  Thom Wiggers authored Dec 29, 2016
```
Resolve "view on site is stuk in partners (vacancies)"

Closes #173

See merge request !293
```
  f768a077
- Prevent window resize function to be called twice on page load · e5de1e59
  Luuk Scholten authored Dec 29, 2016
  
  e5de1e59
- Add absolute url to go directly to vacancies · 224ef953
  Luuk Scholten authored Dec 29, 2016
  
  224ef953
24 Dec, 2016 1 commit
- Merge branch 'refactor-css' into 'master' · 4ce21b27
  Luuk Scholten authored Dec 24, 2016
```
Refactor parts of the CSS, fix style issues

Closes #220

See merge request !274
```
  4ce21b27
22 Dec, 2016 3 commits
- Merge branch '116-numerieke-sortering-pizza-aantallen-bedragen-i-p-v-alfabetisch' into 'master' · df248afc
  Thom Wiggers authored Dec 22, 2016
```
Fix ordering of numeric data in pizza frontend

Closes #116

See merge request !287
```
  df248afc
- Merge branch 'fix/order_volgorde' into 'master' · 2eebb83d
  Jim Driessen authored Dec 22, 2016
```
Add context

Zoals gezegd

See merge request !291
```
  2eebb83d
- Add context · 6195831d
  Joren Vrancken authored Dec 22, 2016
  
  6195831d
21 Dec, 2016 18 commits
- Merge branch 'superuser_only_crash' into 'master' · 18239156
  Luuk Scholten authored Dec 21, 2016
```
Make /crash superuser-only

See merge request !288
```
  18239156
- Make crash superuser-only · 65af37b3
  Thom Wiggers authored Dec 21, 2016
  
  65af37b3
- Fix ordering of numeric data in pizza frontend · 535cc49d
  Joost Rijneveld authored Dec 21, 2016
  
  535cc49d
- Fix content type of error · b83ef584
  Thom Wiggers authored Dec 21, 2016
  
  b83ef584
- Test wiki login api · ea4eee63
  Thom Wiggers authored Dec 21, 2016
  
  ea4eee63
- Merge branch 'release/1.1.0' into 'master' · f86ec239
  Luuk Scholten authored Dec 21, 2016
```
Backmerge of 🚑 1.1.1

See merge request !285
```
  f86ec239
- Merge branch 'fix/export_event_data' into 'master' · 1f06e650
  Luuk Scholten authored Dec 21, 2016
```
Fix/export event data

closes #258

See merge request !284
```
  1f06e650
- Code improvement, added late cancellation and changed header order · c321af15
  Joren Vrancken authored Dec 21, 2016
  
  c321af15
- Merge branch '260-automatisch-plaatje-bij-link' into 'master' · 9cbeea72
  Luuk Scholten authored Dec 21, 2016
```
Add Open Graph tags.

Closes #260

See merge request !283
```
  9cbeea72
- Add Open Graph tags. · dc9cd90e
  Jim Driessen authored Dec 21, 2016
  
  dc9cd90e
- Merge branch 'fixtures-random-starting-year' into 'master' · 1ca3e353
  Joost Rijneveld authored Dec 21, 2016
```
Makes the starting year for fixture users truly random

See merge request !280
```
  1ca3e353
- Merge branch '251-add-link-to-pizzas-in-the-menu' into 'master' · 59edc12c
  Thom Wiggers authored Dec 21, 2016
```
Add 'ordering pizza' to the menu

Closes #251

See merge request !279
```
  59edc12c
- Merge branch 'feature/ical-event-link' into 'master' · 69cdc0eb
  Luuk Scholten authored Dec 21, 2016
```
Add link to iCal event description

Closes #244

See merge request !278
```
  69cdc0eb
- Add 'ordering pizza' to the menu · 0a48bbe1
  Joost Rijneveld authored Dec 21, 2016
  
  0a48bbe1
- Merge branch '242-er-moet-een-stukje-django-voor-media-styleguide-dat-ok-zegt' into 'master' · 6e0ed037
  Joost Rijneveld authored Dec 21, 2016
```
Zet een stukje voor media styleguide dat ok zegt

Closes #242 

Fixt ook meteen een vertalingsfout

See merge request !281
```
  6e0ed037
- Makes the starting year for fixture users truly random · c54f43f6
  Wietse Kuipers authored Dec 21, 2016
  
  c54f43f6
- Zet een stukje voor media styleguide dat ok zegt · dda7af51
  Thom Wiggers authored Dec 21, 2016
```
closes #242
```
  dda7af51
- Add link to iCal event description · fe771959
  Sébastiaan Versteeg authored Dec 21, 2016
  
  fe771959