Commits · 864712defa9c2bc8d58f7d318aa290b201d2eae2 · thalia / concrexit

14 Mar, 2018 13 commits
- Merge branch 'fix/mock_dev_reqs' into 'master' · 864712de
  Thom Wiggers authored Mar 14, 2018
```
Mock dev-requirements necessary during docker build

See merge request !758
```
  864712de
- Merge branch '607-increase-events-on-homepage' into 'master' · b3632291
  Thom Wiggers authored Mar 14, 2018
```
Resolve "Increase the number of events on the homepage"

Closes #607

See merge request !756
```
  b3632291
- Mock dev-requirments necessary during docker build · 4e0b76c1
  Joren Vrancken authored Mar 14, 2018
  
  4e0b76c1
- increased amount of events on hompage to six · 0c240866
  Luko van der Maas authored Mar 14, 2018
  
  0c240866
- Merge branch 'fix/receive-category-always-empty' into 'master' · c7030ca1
  Thom Wiggers authored Mar 14, 2018
```
Add failsafes, if no receive_category values are set in the API: enable them all

See merge request !754
```
  c7030ca1
- Merge branch 'fix/documents-minutes-file' into 'master' · 82cbad31
  Thom Wiggers authored Mar 14, 2018
```
Fix/documents minutes file

See merge request !755
```
  82cbad31
- Fix file key in MinutesInline admin · 0287fcf6
  Sébastiaan Versteeg authored Mar 14, 2018
  
  0287fcf6
- Add failsafes, if no receive_category values are set in the API: enable them all · 6ace705e
  Sébastiaan Versteeg authored Mar 14, 2018
  
  6ace705e
- Merge branch 'fix/text-align-committee-detail' into 'master' · a1b2460d
  Thom Wiggers authored Mar 14, 2018
```
Fix text alignment on committee detail pages

See merge request !746
```
  a1b2460d
- Merge branch 'feature/save-language-in-push-notification-api' into 'master' · b2543977
  Thom Wiggers authored Mar 14, 2018
```
Save Accept-Language in the push notification Devices

See merge request !744
```
  b2543977
- Merge branch 'revert-0c3d89ad' into 'master' · 0deddef3
  Thom Wiggers authored Mar 14, 2018
```
Revert "Merge branch 'feature/token-middleware' into 'master'"

See merge request !742
```
  0deddef3
- Use get_language_from_request instead of directly checking the headers · b7abc016
  Sébastiaan Versteeg authored Mar 14, 2018
  
  b7abc016
- Merge branch 'pizza-filters' into 'master' · c4d23d08
  Tom van Bussel authored Mar 14, 2018
```
Allow filtering by availability in the pizza product admin

See merge request !753
```
  c4d23d08
13 Mar, 2018 1 commit
- Allow filtering by availability in the pizza product admin · 7c34d97c
  Thom Wiggers authored Mar 13, 2018
  
  7c34d97c
10 Mar, 2018 2 commits
- Fix text alignment on committee detail pages · af194722
  Sébastiaan Versteeg authored Mar 10, 2018
  
  af194722
- Merge branch '598-thabloid-year' into 'master' · f37b5fb1
  Sébastiaan Versteeg authored Mar 10, 2018
```
Resolve "Adding/changing Thabloids: field "year""

Closes #598

See merge request !743
```
  f37b5fb1
07 Mar, 2018 6 commits
- Save Accept-Language in the push notification Devices · 42357112
  Gijs Hendriksen authored Mar 07, 2018
  
  42357112
- Setting year of thabloid in admin · 63950b54
  Tom van Bussel authored Mar 07, 2018
  
  63950b54
- Merge branch '536-multilingual-push-notifications' into 'master' · 27f3126c
  Sébastiaan Versteeg authored Mar 07, 2018
```
Resolve "Multilingual push notifications"

Closes #536

See merge request !736
```
  27f3126c
- Revert "Merge branch 'feature/token-middleware' into 'master'" · e6113dde
  Sébastiaan Versteeg authored Mar 07, 2018
```
This reverts merge request !738
```
  e6113dde
- Added multilingual title and body and added support to the send and admin · 696950b5
  Luko van der Maas authored Feb 28, 2018
  
  696950b5
- Merge branch 'improve-photos-code' into 'master' · 14d8dfcc
  Tom van Bussel authored Mar 07, 2018
```
Improve photos services code

See merge request !733
```
  14d8dfcc
06 Mar, 2018 4 commits
- Merge branch 'security-update-2.0.3' into 'master' · 7f5a40eb
  Sébastiaan Versteeg authored Mar 06, 2018
```
Update to Django 2.0.3

See merge request !740
```
  7f5a40eb
- Merge branch 'fix/photos-api-title' into 'master' · 142a94e6
  Thom Wiggers authored Mar 06, 2018
```
Fix photos api title field

See merge request !737
```
  142a94e6
- Merge branch 'feature/token-middleware' into 'master' · 0c3d89ad
  Thom Wiggers authored Mar 06, 2018
```
Add TokenMiddleware

See merge request !738
```
  0c3d89ad
- Update to Django 2.0.3 · f7d9f384
  Thom Wiggers authored Mar 06, 2018
  
  f7d9f384
03 Mar, 2018 1 commit
- Add TokenMiddleware · edbe1785
  Sébastiaan Versteeg authored Mar 01, 2018
  
  edbe1785
28 Feb, 2018 1 commit
- Fix photos api title field · 81dad0b9
  Sébastiaan Versteeg authored Feb 28, 2018
  
  81dad0b9
27 Feb, 2018 1 commit
- Improve photos services code · 522be179
  Sébastiaan Versteeg authored Feb 17, 2018
  
  522be179
22 Feb, 2018 2 commits
- Merge branch 'templatecheck_only_when_installed' into 'master' · db3f307b
  Joost Rijneveld authored Feb 22, 2018
```
Only set up templatecheck if installed

See merge request !734
```
  db3f307b
- Merge branch '538-add-filtering-to-push-notifications' into 'master' · ad685ca1
  Thom Wiggers authored Feb 22, 2018
```
Resolve "Add filtering to push notifications"

Closes #538

See merge request !665
```
  ad685ca1
21 Feb, 2018 5 commits
- added an api for setting the categories and listing them in the devices path · 2c203cca
  Luko van der Maas authored Jan 17, 2018
  
  2c203cca
- revamed the categories to a model and added fields to device and message.... · 36790af2
  Luko van der Maas authored Dec 20, 2017
```
revamed the categories to a model and added fields to device and message. Added filtering for pushnotifications
```
  36790af2
- Don't install dev-requirements into release builds · fe69674c
  Thom Wiggers authored Feb 21, 2018
  
  fe69674c
- Only set up templatecheck if installed · 80d4149e
  Thom Wiggers authored Feb 19, 2018
  
  80d4149e
- Merge branch 'thread-sphinx-build' into 'master' · 9e6a8dfe
  Joost Rijneveld authored Feb 21, 2018
```
Run sphinx-build on all cores

See merge request !731
```
  9e6a8dfe
18 Feb, 2018 1 commit
- Merge branch 'feature/use-exif-to-determine-rotation' into 'master' · 8511044b
  Thom Wiggers authored Feb 18, 2018
```
Use Orientation EXIF tag in photo to determine orientation on upload

Closes #591

See merge request !730
```
  8511044b
16 Feb, 2018 3 commits
- Use Orientation EXIF tag in photo to determine orientation on upload · 311d25d5
  Sébastiaan Versteeg authored Feb 15, 2018
  
  311d25d5
- Merge branch 'fix_registrationinformationfield_ordering' into 'master' · 1d7d95c7
  Sébastiaan Versteeg authored Feb 16, 2018
```
Fix RegistrationInformationfield ordering

Closes #592

See merge request !732
```
  1d7d95c7
- Improve errors raised by registration_fields · 162db37d
  Thom Wiggers authored Feb 16, 2018
  
  162db37d