Commits · 37c6e49f6aa3d03bae35e9be4a0c7c6f40f6b1d3 · thalia / concrexit

28 Nov, 2018 1 commit
- Added the Possibility To Enter Uppercase Student Number · 37c6e49f
  Thijs de Jong authored Nov 21, 2018
  
  37c6e49f
21 Nov, 2018 10 commits
- Merge branch 'bug/button-members' into 'master' · 52480d09
  Joren Vrancken authored Nov 21, 2018
```
Changed Search Button On Member Page

Closes #773

See merge request !1068
```
  52480d09
- Changed Search Button · e7a5fc86
  Thijs de Jong authored Nov 21, 2018
  
  e7a5fc86
- Merge branch 'bug/event-buttons' into 'master' · 27b10807
  Sébastiaan Versteeg authored Nov 21, 2018
```
Changed Buttons of Events

Closes #779

See merge request !1066
```
  27b10807
- Merge branch 'fix/footer-stickyness' into 'master' · 7fc073eb
  Thijs de Jong authored Nov 21, 2018
```
Make footer stick to bottom

Closes #781

See merge request !1067
```
  7fc073eb
- Changed Buttons of Events · f7184117
  Thijs de Jong authored Nov 18, 2018
  
  f7184117
- Merge branch 'feature/update-profile-picture-in-member-api' into 'master' · 1492ed28
  Sébastiaan Versteeg authored Nov 21, 2018
```
Added the ability to edit your profile through the members API

See merge request !1041
```
  1492ed28
- Merge branch 'bug/button-alignment' into 'master' · dbb1d791
  Sébastiaan Versteeg authored Nov 21, 2018
```
Changed Layout Button

Closes #780

See merge request !1065
```
  dbb1d791
- Make footer stick to bottom · 851c7d93
  Sébastiaan Versteeg authored Nov 21, 2018
  
  851c7d93
- Added the ability to edit your profile through the API · 9124db29
  Gijs Hendriksen authored Nov 07, 2018
  
  9124db29
- Changed Layout Button · 504b59e9
  Thijs de Jong authored Nov 18, 2018
  
  504b59e9
19 Nov, 2018 1 commit
- Merge branch 'feature/alumni-page' into 'master' · c72ccb53
  Joren Vrancken authored Nov 19, 2018
```
Add alumni page

Closes #752

See merge request !1055
```
  c72ccb53
18 Nov, 2018 1 commit
- Merge branch 'fix/membergroup-photo-aspectratio' into 'master' · f3dcfa7d
  Joren Vrancken authored Nov 18, 2018
```
Fix aspect ratio of membergroup photos

Closes #774

See merge request !1064
```
  f3dcfa7d
15 Nov, 2018 1 commit
- Fix aspect ratio of membergroup photos · a6e1417e
  Sébastiaan Versteeg authored Nov 15, 2018
  
  a6e1417e
14 Nov, 2018 26 commits
- Add alumni page · cc147657
  Sébastiaan Versteeg authored Nov 12, 2018
  
  cc147657
- Merge branch 'feature/photo-search' into 'master' · fcd2d254
  Sébastiaan Versteeg authored Nov 14, 2018
```
Add search functionality to photos app

Closes #722

See merge request !1034
```
  fcd2d254
- Merge branch 'tc/associations' into 'master' · c8a84f47
  Sébastiaan Versteeg authored Nov 14, 2018
```
Changed Sister Associations to Sibling Associations

Closes #763

See merge request !1063
```
  c8a84f47
- Changed Sister Associations to Sibling Associations · c8f7e216
  Thijs de Jong authored Nov 14, 2018
  
  c8f7e216
- Merge branch... · fef4734c
  Sébastiaan Versteeg authored Nov 14, 2018
```
Merge branch '739-change-dropdown-menu-in-front-end-for-user-registration-enrollment-with-amount' into 'master'

Change dropdown menu in front-end for user registration/enrollment with amount

Closes #739

See merge request !1061
```
  fef4734c
- Merge branch 'tc/event-notif' into 'master' · 444c6f82
  Sébastiaan Versteeg authored Nov 14, 2018
```
Added Notification When Creating Events

Closes #765

See merge request !1062
```
  444c6f82
- Added prices to the dropdown menu for choosing your membership term. · e27ada03
  Bart Hofman authored Nov 14, 2018
  
  e27ada03
- Added Notification · deb58e57
  Thijs de Jong authored Nov 14, 2018
  
  deb58e57
- Merge branch 'tc/society-header' into 'master' · 13f0d94c
  Sébastiaan Versteeg authored Nov 14, 2018
```
Added Societies Header on Profiles

Closes #755

See merge request !1040
```
  13f0d94c
- Compact Code · d5435309
  Thijs de Jong authored Nov 14, 2018 and Thijs de Jong committed Nov 14, 2018
  
  d5435309
- Added Societies Header on Profile · 061346c6
  Thijs de Jong authored Nov 07, 2018 and Thijs de Jong committed Nov 14, 2018
  
  061346c6
- Merge branch 'update-django' into 'master' · d24295de
  Thom Wiggers authored Nov 14, 2018
```
Update to Django 2.1

See merge request !1029
```
  d24295de
- Update to Django 2.1 · 389d664d
  Sébastiaan Versteeg authored Nov 02, 2018 and Thom Wiggers committed Nov 14, 2018
  
  389d664d
- Add search functionality to photos app · e3c69375
  Sébastiaan Versteeg authored Nov 05, 2018 and Tom van Bussel committed Nov 14, 2018
  
  e3c69375
- Merge branch '723-replace-highcharts-by-chart-js' into 'master' · ccd0357e
  Sébastiaan Versteeg authored Nov 14, 2018
```
Replace Highcharts by Chart.js

Closes #723

See merge request !997
```
  ccd0357e
- added all statistics back · 8b0266dc
  Luko van der Maas authored Nov 14, 2018 and Thom Wiggers committed Nov 14, 2018
  
  8b0266dc
- firsts steps in chartjs · 6ef8e59c
  Luko van der Maas authored Oct 17, 2018 and Thom Wiggers committed Nov 14, 2018
  
  6ef8e59c
- Merge branch 'tc/update-fancybox' into 'master' · 4d0daa28
  Thom Wiggers authored Nov 14, 2018
```
Update Fancybox to version 3

Closes #724

See merge request !1052
```
  4d0daa28
- Update Fancybox to version 3 · af5fea48
  Sébastiaan Versteeg authored Nov 11, 2018 and Thom Wiggers committed Nov 14, 2018
  
  af5fea48
- Merge branch 'bugfix/thabloid-older-years' into 'master' · 82feedda
  Thom Wiggers authored Nov 14, 2018
```
Fix 'older Thabloids' category

Closes #771

See merge request !1059
```
  82feedda
- Fix 'older Thabloids' category · 265ae251
  Joost Rijneveld authored Nov 14, 2018 and Luko van der Maas committed Nov 14, 2018
```
The condition was always True, and the class name was incorrect
```
  265ae251
- Merge branch 'fix/events-js-csp' into 'master' · 4abd0880
  Luko van der Maas authored Nov 14, 2018
```
Fix events javascript to be compressed again

See merge request !1058
```
  4abd0880
- Fix events javascript to be compressed again · 211b08aa
  Sébastiaan Versteeg authored Nov 13, 2018 and Luko van der Maas committed Nov 14, 2018
  
  211b08aa
- Merge branch 'feature/member-email-export' into 'master' · 851ee4f4
  Luko van der Maas authored Nov 14, 2018
```
Add email address CSV export feature

Closes #768

See merge request !1054
```
  851ee4f4
- Add email address CSV export feature · b9a9b156
  Sébastiaan Versteeg authored Nov 12, 2018 and Luko van der Maas committed Nov 14, 2018
  
  b9a9b156
- Merge branch 'feature/old-member-filter' into 'master' · 6c715a94
  Luko van der Maas authored Nov 14, 2018
```
Add filter to get all users without an active membership

Closes #767

See merge request !1053
```
  6c715a94