Commits · bb7568c8cdeaa9ea0987ded708eb24fa33d740b7 · thalia / concrexit

08 Aug, 2018 1 commit
- Merge branch 'cherry-pick-77d9b01c' into 'release/1.16' · bb7568c8
  Sébastiaan Versteeg authored Aug 08, 2018
```
Merge branch 'fix/registrations-confirm-email-doesnotexist' into 'master'

See merge request !881
```
  bb7568c8
07 Aug, 2018 2 commits

Merge branch 'fix/registrations-confirm-email-doesnotexist' into 'master' · 3c04eda6

Thom Wiggers authored Jul 25, 2018 and

Sébastiaan Versteeg committed Aug 07, 2018

Crash on confirming non-existing registration entry

Closes #665

See merge request !867

(cherry picked from commit 77d9b01c)

79f3b1f8 Rewrite ConfirmEmailViewTest to catch Entry.DoesNotExist
f5865c99 Catch the right DoesNotExist exception in ConfirmEmailView

3c04eda6

Merge branch 'cherry-pick-86bb6dab' into 'release/1.16' · 9af698b0
Sébastiaan Versteeg authored Aug 07, 2018
```
Hotfix: Update Django to 2.0.8

See merge request !880
```
9af698b0

02 Aug, 2018 1 commit
- Merge branch 'django-security-update' into 'master' · 3c66bb81
  Sébastiaan Versteeg authored Aug 02, 2018 and Thom Wiggers committed Aug 02, 2018
```
Update to Django >=2.0.8

See merge request !878

(cherry picked from commit 86bb6dab)

5c59c323 Update to Django >=2.0.8
```
  3c66bb81
12 Jul, 2018 10 commits
- Show new fields in admin · 294d2b1c
  Sébastiaan Versteeg authored Jul 11, 2018
  
  294d2b1c
- Fix payment not being added to registration entry · 0c9798e7
  Sébastiaan Versteeg authored Jul 11, 2018
  
  0c9798e7
- Fix typo in push notificatin devices viewset · c5673057
  Gijs Hendriksen authored Jul 11, 2018 and Sébastiaan Versteeg committed Jul 12, 2018
  
  c5673057
- Fix registration options to not be required · 3f5fc911
  Sébastiaan Versteeg authored Jul 11, 2018
  
  3f5fc911
- Add optins to members registration form · 52978a47
  Sébastiaan Versteeg authored Jul 04, 2018
  
  52978a47
- Fix member expiration emails · 786d5596
  Sébastiaan Versteeg authored Jul 10, 2018
  
  786d5596
- Fix conditions for showing presence and payment · e9511f9d
  Tom van Bussel authored Jul 04, 2018 and Sébastiaan Versteeg committed Jul 12, 2018
```
on the event page
```
  e9511f9d
- Fix 'to' email address in email change confirmation email · 94b86635
  Sébastiaan Versteeg authored Jun 21, 2018 and Sébastiaan Versteeg committed Jul 12, 2018
  
  94b86635
- Make phone number optional during member registration · 944600d8
  Sébastiaan Versteeg authored Jul 04, 2018
  
  944600d8
- Add privacy policy checkbox to renewal form · 206ecb6b
  Sébastiaan Versteeg authored Jul 10, 2018
  
  206ecb6b
13 Jun, 2018 26 commits
- Merge branch 'fix/documents-unavailable' into 'master' · 8bc4bcbd
  Joren Vrancken authored Jun 13, 2018
```
Fix LectureYearFilter if no documents yet

See merge request !839
```
  8bc4bcbd
- Fix LectureYearFilter if no documents yet · 0135e3b4
  Sébastiaan Versteeg authored Jun 13, 2018
  
  0135e3b4
- Merge branch '641-lecture-year' into 'master' · c3ce8af6
  Sébastiaan Versteeg authored Jun 13, 2018
```
Resolve "It is unclear if the year field on documents in the backend refers to the first or last year of the academic year."

Closes #641

See merge request !838
```
  c3ce8af6
- Merge branch 'feature/personal-ical-feed' into 'master' · 0629c95c
  Sébastiaan Versteeg authored Jun 13, 2018
```
Added token-based personal iCal feed

Closes #646

See merge request !836
```
  0629c95c
- Clarify lecture years in documents admin · a8e901a0
  Tom van Bussel authored Jun 13, 2018
  
  a8e901a0
- Merge branch 'fix/event-cancel-after-start' into 'master' · 83c58cdf
  Tom van Bussel authored Jun 13, 2018
```
Disallow cancellation after event start

See merge request !837
```
  83c58cdf
- Disallow cancellation after event start · 25fecda3
  Sébastiaan Versteeg authored Jun 13, 2018
  
  25fecda3
- Added token-based personal iCal feed · f76ddc0a
  Gijs Hendriksen authored Jun 13, 2018
  
  f76ddc0a
- Merge branch 'fix/remove-onion-service-link' into 'master' · f5d3aa7a
  Tom van Bussel authored Jun 13, 2018
```
Remove .onion service link in footer

See merge request !835
```
  f5d3aa7a
- Merge branch 'feature/force-general-category' into 'master' · e2d2daa2
  Tom van Bussel authored Jun 13, 2018
```
Force general category

See merge request !833
```
  e2d2daa2
- Remove .onion service link in footer · f135e920
  Sébastiaan Versteeg authored Jun 13, 2018
  
  f135e920
- Merge branch 'feature/email-change' into 'master' · b5a52413
  Tom van Bussel authored Jun 13, 2018
```
Add email change feature to members

Closes #544

See merge request !827
```
  b5a52413
- Merge branch '640-new-filter' into 'master' · 30aaf9c5
  Sébastiaan Versteeg authored Jun 13, 2018
```
Add filter to committee membership admin for active memberships

Closes #640

See merge request !834
```
  30aaf9c5
- Add a new filter for active committee memberships · c4c927e6
  Tom van Bussel authored Jun 13, 2018
  
  c4c927e6
- Add email change feature to members · 3be5cfc5
  Sébastiaan Versteeg authored Jun 07, 2018
  
  3be5cfc5
- Merge branch 'fix/pushnotification-registration' into 'master' · 998cd827
  Tom van Bussel authored Jun 13, 2018
```
Fix push notification registration request

Closes ThaliApp#63

See merge request !832
```
  998cd827
- Merge branch 'fix/education-membership-required' into 'master' · ce196335
  Tom van Bussel authored Jun 13, 2018
```
Add membership decorator and require an active membership to download exams/summaries

See merge request !814
```
  ce196335
- Merge branch 'feature/events-documentation' into 'master' · d100b118
  Tom van Bussel authored Jun 13, 2018
```
Add docs to events package

Closes #575

See merge request !813
```
  d100b118
- Add docs to events package · c78e77db
  Sébastiaan Versteeg authored May 27, 2018
  
  c78e77db
- Merge branch 'feature/documents-documentation' into 'master' · 0d0affd0
  Tom van Bussel authored Jun 13, 2018
```
Add documentation to the documents package

Closes #573

See merge request !811
```
  0d0affd0
- Merge branch 'fix/html-entities-organiser-email' into 'master' · a724a226
  Tom van Bussel authored Jun 13, 2018
```
Fix HTML entities in the event organiser email

Closes #625

See merge request !821
```
  a724a226
- Merge branch 'feature/make-no-member-banner-clickable' into 'master' · 8a57c6ec
  Tom van Bussel authored Jun 13, 2018
```
Make no-member banner clickable

See merge request thalia/concrexit!823
```
  8a57c6ec
- Merge branch 'tc/update-fontawesome' into 'master' · 94d126a9
  Tom van Bussel authored Jun 13, 2018
```
Update font-awesome to 4.7

See merge request !822
```
  94d126a9
- Merge branch 'fix/thabloid-sizing' into 'master' · af88d1c5
  Tom van Bussel authored Jun 13, 2018
```
Fix thabloids sizing on load

Closes #639

See merge request !820
```
  af88d1c5
- Merge branch 'feature/documentation-education' into 'master' · 4fbca140
  Tom van Bussel authored Jun 13, 2018
```
Add documentation to the education package

Closes #574

See merge request !815
```
  4fbca140
- Merge branch 'feature/activemembers-documentation' into 'master' · a11b7ea5
  Tom van Bussel authored Jun 13, 2018
```
Add and change documentation in the activemembers package

Closes #572

See merge request !810
```
  a11b7ea5