Commits · ce5c00eb3022c281bda9ffe8bdedf2db44ae8e51 · thalia / concrexit

31 May, 2017 5 commits
- Add NamespaceVersioning to Django · ce5c00eb
  Sébastiaan Versteeg authored May 31, 2017
  
  ce5c00eb
- Merge branch 'thaliapp/members-api' into 'master' · 132422fe
  Wietse Kuipers authored May 31, 2017
```
Thaliapp: members api

See merge request !490
```
  132422fe
- Merge branch 'api-events-thaliapp' into 'master' · 36a73f5f
  Wietse Kuipers authored May 31, 2017
```
ThaliApp: events api

See merge request !489
```
  36a73f5f
- Fix absolute uri to default-avatar · f9c0313e
  Sébastiaan Versteeg authored May 31, 2017
  
  f9c0313e
- Fix default-avatar uri · 71244c08
  Sébastiaan Versteeg authored May 31, 2017
  
  71244c08
29 May, 2017 2 commits
- Use ActiveMemberManager and use avatar urls in members api list · 4ff2db65
  Sébastiaan Versteeg authored May 29, 2017
  
  4ff2db65
- Separate serializers for members, add fields and filter backends · 73ba2e4b
  Sébastiaan Versteeg authored May 29, 2017
  
  73ba2e4b
28 May, 2017 15 commits
- Make sure you can only access other (=queued/cancelled) registrations when you... · c40da761
  Sébastiaan Versteeg authored May 28, 2017
```
Make sure you can only access other (=queued/cancelled) registrations when you have the perms to do so
```
  c40da761
- Add ordering instead of shortlist route · 3b6f523d
  Sébastiaan Versteeg authored May 28, 2017
  
  3b6f523d
- Use same serializer for all registration objects · e60f6bfd
  Sébastiaan Versteeg authored May 28, 2017
  
  e60f6bfd
- Added viewset for retrieving next two days with events · 2954ceb5
  Gijs Hendriksen authored May 28, 2017 and Sébastiaan Versteeg committed May 28, 2017
  
  2954ceb5
- Added pizza field to serializer · c21f838f
  Gijs Hendriksen authored May 28, 2017 and Sébastiaan Versteeg committed May 28, 2017
  
  c21f838f
- Fixed PEP8 failures · d2b73133
  Gijs Hendriksen authored May 28, 2017 and Sébastiaan Versteeg committed May 28, 2017
  
  d2b73133
- Use direct photo url instead of base64 since no saving is necessary · 96f0c711
  Sébastiaan Versteeg authored May 27, 2017
  
  96f0c711
- Add Event API fields to make sure design can be realised · 65fb2efd
  Sébastiaan Versteeg authored May 25, 2017
  
  65fb2efd
- Fix PEP8 failures · 66f4cf30
  Luuk Scholten authored May 24, 2017 and Sébastiaan Versteeg committed May 28, 2017
  
  66f4cf30
- Rename event api 'id' to 'pk' · 5a333d8d
  Luuk Scholten authored May 24, 2017 and Sébastiaan Versteeg committed May 28, 2017
  
  5a333d8d
- Move strip_tags event description to serializers · 11ada359
  Luuk Scholten authored May 24, 2017 and Sébastiaan Versteeg committed May 28, 2017
  
  11ada359
- Refactor the api to use the default readonlyviewset · a75bd9a6
  Luuk Scholten authored May 24, 2017 and Sébastiaan Versteeg committed May 28, 2017
  
  a75bd9a6
- Stripped tags from event descriptions · c7507415
  Gijs Hendriksen authored May 03, 2017 and Sébastiaan Versteeg committed May 28, 2017
  
  c7507415
- tox fixes · 2abd6307
  AuckeBos authored Apr 19, 2017 and Sébastiaan Versteeg committed May 28, 2017
  
  2abd6307
- Added API for event info · b5bca7fd
  Gijs Hendriksen authored Apr 19, 2017 and Sébastiaan Versteeg committed May 28, 2017
  
  b5bca7fd
27 May, 2017 3 commits
- Merge branch 'feature/api-pagination' into 'master' · b00f294c
  Luuk Scholten authored May 27, 2017
```
Introducing: API Pagination

See merge request !492
```
  b00f294c
- Add LimitOffsetPagination to REST framework settings · 8bc2bfab
  Sébastiaan Versteeg authored May 27, 2017
  
  8bc2bfab
- Merge branch '437-boete-niet-verplicht-bij-evenementen-zonder-inschrijvingen' into 'master' · b42022f2
  Sébastiaan Versteeg authored May 27, 2017
```
Fine no longer required for events without registration

Closes #437

See merge request !487
```
  b42022f2
24 May, 2017 7 commits
- Move photo base64 encoder to the member serializer · 1a694377
  Luuk Scholten authored May 24, 2017
  
  1a694377
- Better url for list current member api · b01e5491
  Luuk Scholten authored May 24, 2017
  
  b01e5491
- Add member list and pk retrieve api · 12eb2fdf
  Luuk Scholten authored May 24, 2017
  
  12eb2fdf
- Serializer for display name and avatar · ad6e2f26
  Gijs Hendriksen authored May 16, 2017
  
  ad6e2f26
- Added test and fixed test setup data to have fine=5 · 32963325
  Milan van Stiphout authored May 24, 2017
  
  32963325
- Made migration so that this actually works · 1df88c82
  Milan van Stiphout authored May 24, 2017
  
  1df88c82
- Fine no longer required for events without registration. · 35236771
  Milan van Stiphout authored May 24, 2017
```
This is now checked only if the event status is REGISTRATION_REQUIRED in the clean() of the model.
```
  35236771
17 May, 2017 5 commits
- Merge branch 'feature/422-mailinglist-search' into 'master' · 8143e661
  Thom Wiggers authored May 17, 2017
```
Add alias searching to mailinglists and show them in the admin overview

Closes #422

See merge request !485
```
  8143e661
- Merge branch '346-register-before-fields' into 'master' · 3d5b1d68
  Luuk Scholten authored May 17, 2017
```
Create registration before fields are filled in

Closes #346

See merge request !477
```
  3d5b1d68
- Add alias searching to mailinglists and show them in the admin overview · e0367428
  Sébastiaan Versteeg authored May 17, 2017
  
  e0367428
- Merge branch '384-add-linkify-to-anouncements' into 'master' · 7857a9e0
  Luuk Scholten authored May 17, 2017
```
Add HTMLField for announcements

Closes #384 and #385

See merge request !484
```
  7857a9e0
- Add HTMLField for announcements · dc83a6f2
  Sébastiaan Versteeg authored May 10, 2017
  
  dc83a6f2
10 May, 2017 3 commits
- Merge branch 'fix/428-photo-thumbnail-fit' into 'master' · 0a3e2216
  Tom van Bussel authored May 10, 2017
```
Make sure 'fit' variable is an int for thumbnails

Closes #428

See merge request !475
```
  0a3e2216
- Merge branch 'feature/432-event-registration-count' into 'master' · 9dfa50de
  Luuk Scholten authored May 10, 2017
```
Add number of registrations to backend event details

Closes #432

See merge request !478
```
  9dfa50de
- Merge branch 'fix/423-escaping-vacancy-html' into 'master' · 5f7f9009
  Luuk Scholten authored May 10, 2017
```
Fix vacancy description showing HTML entities

Closes #423

See merge request !481
```
  5f7f9009