Commits · e3c6937503b496abeed0c96d8eca3449fb59507e · thalia / concrexit

14 Nov, 2018 20 commits
- Add search functionality to photos app · e3c69375
  Sébastiaan Versteeg authored Nov 05, 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
  
  8b0266dc
- firsts steps in chartjs · 6ef8e59c
  Luko van der Maas authored Oct 17, 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
  
  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
```
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
  
  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
  
  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
- Add starting year field to admin as well · 7d573204
  Sébastiaan Versteeg authored Nov 12, 2018
  
  7d573204
- Add filter to get all users without an active membership · c5aeb8da
  Sébastiaan Versteeg authored Nov 12, 2018
  
  c5aeb8da
- Merge branch 'fix/registration-uniqueness' into 'master' · 7aec1a31
  Luko van der Maas authored Nov 14, 2018
```
Make member-event combination unique for event registrations

Closes #487

See merge request !1051
```
  7aec1a31
- Make member-event combination unique for event registrations · c02ad6c7
  Sébastiaan Versteeg authored Nov 11, 2018
  
  c02ad6c7
- Merge branch 'extra-ci-tests' into 'master' · fa70c155
  Luko van der Maas authored Nov 14, 2018
```
Add extra CI codestyle tests

See merge request !1043
```
  fa70c155
- Remove fuzzy translation · 9e32235a
  Sébastiaan Versteeg authored Nov 09, 2018
  
  9e32235a
- Add extra CI codestyle tests · 9ce67359
  Sébastiaan Versteeg authored Nov 07, 2018
  
  9ce67359
13 Nov, 2018 4 commits
- Merge branch 'remove-unused-js' into 'master' · ed7864e0
  Luko van der Maas authored Nov 13, 2018
```
Remove unused JS from pizzas overview

See merge request !1057
```
  ed7864e0
- Remove unused JS from pizzas overview · aff40dae
  Sébastiaan Versteeg authored Nov 13, 2018
  
  aff40dae
- Merge branch 'fix/pizzas-orders-js' into 'master' · 15bee46a
  Luko van der Maas authored Nov 13, 2018
```
Fix JavaScript on pizzas order page

See merge request thalia/concrexit!1056
```
  15bee46a
- Fix JavaScript on pizzas order page · b2c10f70
  Sébastiaan Versteeg authored Nov 13, 2018
  
  b2c10f70
11 Nov, 2018 2 commits
- Merge branch 'tech/clean-photos' into 'master' · e377ee09
  Sébastiaan Versteeg authored Nov 11, 2018
```
Cleaned up albums and photos downloads

See merge request !987
```
  e377ee09
- Cleaned up photos views code · ddad8911
  Tom van Bussel authored Oct 10, 2018
  
  ddad8911
08 Nov, 2018 14 commits
- Merge branch 'fix/validate-vacancies' into 'master' · 6d22fa06
  Sébastiaan Versteeg authored Nov 08, 2018
```
Improve vacancy validation

Closes #761

See merge request !1037
```
  6d22fa06
- Improve vacancy validation · 7ca4a4de
  Tom van Bussel authored Nov 07, 2018
  
  7ca4a4de
- Merge branch 'fix/header-iphone-5s' into 'master' · eda83c33
  Jelle Besseling authored Nov 08, 2018
```
Improve usability of header on mobile devices

Closes #762

See merge request !1046
```
  eda83c33
- Improve usability of header on mobile devices · e2a59dac
  Sébastiaan Versteeg authored Nov 08, 2018
  
  e2a59dac
- Merge branch 'fix/header-usability' into 'master' · 12c9f048
  Jelle Besseling authored Nov 08, 2018
```
Fix header size too large on smaller screen laptops

See merge request !1050
```
  12c9f048
- Fix header size too large on smaller screen laptops · e8ea2b15
  Sébastiaan Versteeg authored Nov 08, 2018
  
  e8ea2b15
- Merge branch 'fix/event-frontpage-translation' into 'master' · 3ee2866c
  Jelle Besseling authored Nov 08, 2018
```
Fix events frontpage translation

See merge request !1047
```
  3ee2866c
- Fix events frontpage translation · e00202d9
  Sébastiaan Versteeg authored Nov 08, 2018
  
  e00202d9
- Merge branch 'fix/birthdays-calendar' into 'master' · 4943127f
  Luko van der Maas authored Nov 08, 2018
```
Fix the birthdays calendar by refactoring the start/end date query parsing

Closes #764

See merge request !1049
```
  4943127f
- Fix the birthdays calendar by refactoring the start/end date query parsing · 168a2222
  Sébastiaan Versteeg authored Nov 08, 2018
  
  168a2222
- Merge branch 'fix/statistics-script-tag' into 'master' · ed32d72c
  Jelle Besseling authored Nov 08, 2018
```
Fix usage of script tag on statistics page

See merge request thalia/concrexit!1048
```
  ed32d72c
- Fix usage of script tag on statistics page · 465fc032
  Sébastiaan Versteeg authored Nov 08, 2018
  
  465fc032
- Merge branch 'new-versioning-scheme' into 'master' · 6bf42af4
  Sébastiaan Versteeg authored Nov 08, 2018
```
Adjust to new versioning scheme

See merge request thalia/concrexit!1042
```
  6bf42af4
- Adjust to new versioning scheme · 977b228f
  Thom Wiggers authored Nov 07, 2018
  
  977b228f