Commits · 5360100a43e063e79587bac6cd72554d6f2dc76d · thalia / concrexit

21 Jan, 2017 1 commit
- Make sure models are ordered in admin dropdowns · 5360100a
  Joost Rijneveld authored Jan 19, 2017
  
  5360100a
19 Jan, 2017 5 commits
- Merge branch 'fix/thabloidtest' into 'master' · d18859db
  Thom Wiggers authored Jan 19, 2017
```
Fix warning in tests

See merge request !312
```
  d18859db
- Prevent warnings about unclosed resource · 484ea4d6
  Thom Wiggers authored Jan 19, 2017
```
By properly closing the opened thabloid file
```
  484ea4d6
- Repair the state of the test cases · 443a81dd
  Thom Wiggers authored Jan 19, 2017
```
super()'s tearDownClass() should be called in the overridden method.
```
  443a81dd
- Merge branch 'test_thaliapi' into 'master' · 11953bbc
  Thom Wiggers authored Jan 19, 2017
```
Test the Thaliapp API

See merge request !290
```
  11953bbc
- Merge branch 'feature/newsletter-subject' into 'master' · d12ec173
  Joost Rijneveld authored Jan 19, 2017
```
Add '[THALIA]' to subject of newsletters, as it should be :)

See merge request !311
```
  d12ec173
18 Jan, 2017 1 commit
- Add '[THALIA]' to subject of newsletters, as it should be :) · 187e5bbb
  Sébastiaan Versteeg authored Jan 18, 2017
  
  187e5bbb
16 Jan, 2017 2 commits
- Merge branch 'fix/newsletter-unorderable-crash' into 'master' · 3c97bcdf
  Thom Wiggers authored Jan 16, 2017
```
Fix comparison of two possible NoneTypes

See merge request !310
```
  3c97bcdf
- Fix comparison of two possible NoneTypes · 35805b81
  Sébastiaan Versteeg authored Jan 16, 2017
  
  35805b81
15 Jan, 2017 7 commits
- Merge branch 'fix_sitemap' into 'master' · 48995332
  Joost Rijneveld authored Jan 15, 2017
```
Fix sitemap.xml

Closes #287

See merge request !308
```
  48995332
- Merge branch 'errors-naar-django-errors' into 'master' · 8fe79a14
  Joost Rijneveld authored Jan 15, 2017
```
Errors naar django errors

See merge request !309
```
  8fe79a14
- Disallow broken django-slack version · 7fec5de2
  Thom Wiggers authored Jan 15, 2017
  
  7fec5de2
- Move errors to #django-errors in Slack · 8783562d
  Thom Wiggers authored Jan 15, 2017
  
  8783562d
- Fix thabloid get_absolute_url() · 2334cbf5
  Thom Wiggers authored Jan 15, 2017
  
  2334cbf5
- Merge branch 'hotfix/1.2.1-fix-showcased-partners-missing-id' into 'master' · c8d2cf89
  Thom Wiggers authored Jan 15, 2017
```
Fix 500 error when trying to display showcased partner that is removed

See merge request !305
```
  c8d2cf89
- Merge branch '283-maak-commissies-waarvan-lidmaatschap-permanent-is-mogelijk' into 'master' · d1a835d7
  Thom Wiggers authored Jan 15, 2017
```
Prevent board memberships from ever expiring

Closes #283

See merge request !304
```
  d1a835d7
14 Jan, 2017 2 commits
- Fix 500 error when trying to display showcased partner that is removed · d38b119a
  Luuk Scholten authored Jan 14, 2017
  
  d38b119a
- Prevent board memberships from ever expiring · 8ed14ec2
  Joost Rijneveld authored Jan 14, 2017
  
  8ed14ec2
12 Jan, 2017 1 commit
- Merge branch 'coverage' into 'master' · d99b061d
  Joost Rijneveld authored Jan 12, 2017
```
Report test coverage

See merge request !301
```
  d99b061d
11 Jan, 2017 20 commits
- Add coverage badges because we're hip and cool · 19910942
  Thom Wiggers authored Jan 11, 2017
  
  19910942
- Report test coverage · 153ee16f
  Thom Wiggers authored Jan 11, 2017
  
  153ee16f
- Also handle leap yaers in calendar api · d05be778
  Thom Wiggers authored Jan 11, 2017
  
  d05be778
- Handle leap years · 5a2eafd6
  Thom Wiggers authored Jan 11, 2017
  
  5a2eafd6
- Test the thalia API · 5170d9a5
  Thom Wiggers authored Dec 21, 2016
  
  5170d9a5
- Merge branch 'feature/order-newsletter-items' into 'master' · c11a27da
  Thom Wiggers authored Jan 11, 2017
```
Order newsletter items

Closes #179

See merge request !298
```
  c11a27da
- Merge branch 'feature/newsletter-language-text' into 'master' · a8cac340
  Thom Wiggers authored Jan 11, 2017
```
Add message to the end of the newsletter regarding language change

Closes #182

See merge request !299
```
  a8cac340
- 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
- Add message to the end of the newsletter regarding language change · df41bef2
  Sébastiaan Versteeg authored Jan 11, 2017
  
  df41bef2
- Order newsletter items using order field · 0e099022
  Sébastiaan Versteeg authored Jan 11, 2017
  
  0e099022
- Use right set in views.py · 3e0c58b5
  Sébastiaan Versteeg authored Dec 14, 2016
  
  3e0c58b5
- Make NewsletterContent non-abstract · f0bc11a9
  Sébastiaan Versteeg authored Dec 14, 2016
  
  f0bc11a9
- 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 1 commit
- Remove migration requirements and docs · cb09e0c2
  Thom Wiggers authored Jan 05, 2017
  
  cb09e0c2