Commits · e7bdf0112b40e19e1de654ab59746c5cc6d329c6 · thalia / concrexit

20 Mar, 2018 3 commits
- Set max length for profile description · e7bdf011
  Thom Wiggers authored Mar 20, 2018
```
Closes #615
```
  e7bdf011
- Merge branch 'fix/misc-documents-fixes' into 'master' · e9b4c45a
  Sébastiaan Versteeg authored Mar 20, 2018
```
Miscellaneous documents fixes

Closes #612

See merge request !765
```
  e9b4c45a
- Merge branch 'remove-html-escaping-in-event-description' into 'master' · bc834330
  Thom Wiggers authored Mar 20, 2018
```
Remove HTML escaping in the event description API.

See merge request !735
```
  bc834330
19 Mar, 2018 2 commits
- Remove HTML escaping in the event description API · f09761fe
  Gijs Hendriksen authored Feb 22, 2018
  
  f09761fe
- Miscellaneous documents fixes · 95fc4a10
  Tom van Bussel authored Mar 19, 2018
  
  95fc4a10
16 Mar, 2018 1 commit
- Merge branch 'fix-uploading-gifs' into 'master' · a42b0e4d
  Sébastiaan Versteeg authored Mar 16, 2018
```
Fix uploading gifs

Closes #610

See merge request !757
```
  a42b0e4d
15 Mar, 2018 6 commits
- Merge branch 'fix/overflow-event-titles' into 'master' · 38195964
  Thom Wiggers authored Mar 15, 2018
```
Fix event title overflows with indicator

Closes #596

See merge request !747
```
  38195964
- Merge branch 'feature/cancel-deadline-event-details-admin' into 'master' · 286cba0b
  Thom Wiggers authored Mar 15, 2018
```
Add cancel deadline to event details in admin

Closes #602

See merge request !750
```
  286cba0b
- Merge branch 'feature/export-active-members' into 'master' · 2c53fb54
  Thom Wiggers authored Mar 15, 2018
```
Added extra committee membership filters and an export action

Closes #605

See merge request !760
```
  2c53fb54
- Merge branch 'fix/611' into 'master' · 126f7201
  Thom Wiggers authored Mar 15, 2018
```
Fix import errors during production docker build

Closes #611

See merge request !762
```
  126f7201
- Use string formatting to fix docker build · bc654df1
  Joren Vrancken authored Mar 15, 2018
  
  bc654df1
- Remove multiprocessing Sphinx builds · c00b7945
  Joren Vrancken authored Mar 15, 2018
  
  c00b7945
14 Mar, 2018 16 commits
- Added extra committee membership filters and export · 729a4aa8
  Tom van Bussel authored Mar 14, 2018
  
  729a4aa8
- 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
- Fix uploading gifs · 515ecc33
  Thom Wiggers authored Mar 14, 2018
```
Closes #610
```
  515ecc33
- increased amount of events on hompage to six · 0c240866
  Luko van der Maas authored Mar 14, 2018
  
  0c240866
- Rename ActiveMemberManager to CurrentMemberManager · abf8d3ce
  Tom van Bussel authored Mar 14, 2018
```
and add a new manager for active members.
```
  abf8d3ce
- 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
11 Mar, 2018 2 commits
- Hide registration period info when not available · e6d77ace
  Sébastiaan Versteeg authored Mar 11, 2018
  
  e6d77ace
- Add cancel deadline to event details in admin · 1a5e3a9c
  Sébastiaan Versteeg authored Mar 11, 2018
  
  1a5e3a9c
10 Mar, 2018 3 commits
- Fix event title overflows with indicator · 3fefb94e
  Sébastiaan Versteeg authored Mar 10, 2018
  
  3fefb94e
- 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