Commits · 8bc2bfab885e4377373cee52ee9bc8f6a1bb3954 · thalia / concrexit

27 May, 2017 1 commit
- Add LimitOffsetPagination to REST framework settings · 8bc2bfab
  Sébastiaan Versteeg authored May 27, 2017
  
  8bc2bfab
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 17 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
- Merge branch 'feature/427-event-categories' into 'master' · bd01018a
  Tom van Bussel authored May 10, 2017
```
Add category field to event model

Closes #427

See merge request !479
```
  bd01018a
- Add category field to event model · b70335fb
  Sébastiaan Versteeg authored May 10, 2017
  
  b70335fb
- Merge branch '383-fixtures-partner-logos' into 'master' · 3e388ae6
  Sébastiaan Versteeg authored May 10, 2017
```
Generate logos for partner fixtures

Closes #383

See merge request !480
```
  3e388ae6
- Merge branch 'fix/merge-migrations-photos' into 'master' · b977b6e0
  Tom van Bussel authored May 10, 2017
```
Fix photos migrations

See merge request !482
```
  b977b6e0
- Fix photos migrations · b0817497
  Sébastiaan Versteeg authored May 10, 2017
  
  b0817497
- Fix vacancy description showing HTML entities · 0ebb1c6a
  Sébastiaan Versteeg authored May 10, 2017
  
  0ebb1c6a
- Merge branch '197-robust-photo-uploads' into 'master' · 02df6596
  Sébastiaan Versteeg authored May 10, 2017
```
Resolve "Foto's uploaden moet robuuster"

Closes #197 and #425

See merge request !419
```
  02df6596
- Generate logos for partner fixtures · c014168a
  Tom van Bussel authored May 10, 2017
  
  c014168a
- Merge branch '347-terugnavigeren-vanuit-evenementpagina-reset-calenderview' into 'master' · 32d8131a
  Sébastiaan Versteeg authored May 10, 2017
```
Fix going back to the calendar from an event jumping to the wrong view or date.

Closes #347

See merge request !448
```
  32d8131a
- Add number of registrations to backend event details · df9de070
  Sébastiaan Versteeg authored May 10, 2017
  
  df9de070
- Create registration before fields are filled in · 7315f7c6
  Tom van Bussel authored May 10, 2017
  
  7315f7c6
- Merge branch '426-translations-album-titles' into 'master' · 1dc41d83
  Sébastiaan Versteeg authored May 10, 2017
```
Made album titles multilingual

Closes #426

See merge request !474
```
  1dc41d83
- Made album titles multilingual · 7c6848de
  Tom van Bussel authored May 03, 2017 and Sébastiaan Versteeg committed May 10, 2017
  
  7c6848de
- fix bug in album upload tests · 3005a3ef
  Tom van Bussel authored May 03, 2017
  
  3005a3ef
04 May, 2017 3 commits
- Merge branch 'fix/386-tinymce-editor-size' into 'master' · 73ddf51c
  Thom Wiggers authored May 04, 2017
```
Set TinyMCE editor width/height

Closes #386

See merge request !473
```
  73ddf51c
- Make sure 'fit' variable is an int for thumbnails · ca1eaf34
  Sébastiaan Versteeg authored May 04, 2017
  
  ca1eaf34
- Set TinyMCE editor width/height · b859958f
  Sébastiaan Versteeg authored May 03, 2017
  
  b859958f
03 May, 2017 10 commits
- Merge branch 'fix/415-board-no-until' into 'master' · 5a785fa4
  Thom Wiggers authored May 03, 2017
```
Fix saving board missing 'until' or 'since' values

Closes #415

See merge request !468
```
  5a785fa4
- Fix invalid dates when there was no upcoming activity. · ac838f46
  Jim Driessen authored May 03, 2017
  
  ac838f46
- Fix going back to the calendar from an event jumping to the wrong view or date. · bfcfe345
  Jim Driessen authored Apr 12, 2017
  
  bfcfe345
- Made album slug unique · 470428e8
  Tom van Bussel authored May 03, 2017
  
  470428e8
- tests for album uploads · 3473cebe
  Tom van Bussel authored May 03, 2017
  
  3473cebe
- Added missing translation in photos admin · bc09527b
  Tom van Bussel authored Mar 22, 2017
  
  bc09527b
- Added missing translation in photos admin · 5cb77086
  Tom van Bussel authored Mar 22, 2017
  
  5cb77086
- Squashed photo digest migrations · ff7f149b
  Tom van Bussel authored Mar 22, 2017
  
  ff7f149b
- Generate unique filenames for photos · 5fc4c8d2
  Tom van Bussel authored Mar 22, 2017
```
Foto's krijgen nu een unieke filename (binnen het album). Deze filename
heeft de vorm "0013.jpg".
```
  5fc4c8d2
- Ignore duplicate photos in albums using digests · bbb15e13
  Tom van Bussel authored Mar 08, 2017
```
Photo krijgt nu een extra veld, digest, waarin een SHA1 hash van de foto
staat. Deze digest wordt gebruikt om te zorgen dat er geen dubbele
foto's worden geüpload. Omdat het compressen pas de save() van de foto
gebeurd, wordt het foto object eerst opgeslagen en daarna weer
verwijderd als de foto dubbel is.
```
  bbb15e13
30 Apr, 2017 4 commits
- Change uniqueness of boards to no overlap in period · fd48ca3a
  Sébastiaan Versteeg authored Apr 30, 2017
  
  fd48ca3a
- Fix board validate_unique · 3164fc5f
  Sébastiaan Versteeg authored Apr 30, 2017
  
  3164fc5f
- Test Board model validate_unique · a85fa932
  Sébastiaan Versteeg authored Apr 30, 2017
  
  a85fa932
- Merge branch 'fix/419-event-text' into 'master' · e3a14e0c
  Joost Rijneveld authored Apr 30, 2017
```
Do not show fine warning when registration is in queue

Closes #419

See merge request !466
```
  e3a14e0c