Commits · 12ab7d25ab58d4e976aa47caa6df269059606390 · thalia / concrexit

16 Aug, 2018 3 commits
- Updated book sale page · 12ab7d25
  Gijs Hendriksen authored Aug 16, 2018
  
  12ab7d25
- Merge branch 'computer_computing' into 'master' · c958606d
  Sébastiaan Versteeg authored Aug 16, 2018
```
Use correct english names of studies (and translate "Access the Sentry backend")

See merge request !892
```
  c958606d
- Merge branch 'fix-language-override' into 'master' · f62b93da
  Sébastiaan Versteeg authored Aug 16, 2018
```
Fix language override

Closes #674

See merge request !891
```
  f62b93da
15 Aug, 2018 7 commits
- Merge branch 'no_obsolete' into 'master' · 15b5ffe1
  Thom Wiggers authored Aug 15, 2018
```
Add argument to remove unused translations when running makemessages

See merge request !893
```
  15b5ffe1
- Translate 'Access the Sentry backend' · 58648854
  Joren Vrancken authored Aug 15, 2018
  
  58648854
- Use correct english names of studies · cd6a5193
  Joren Vrancken authored Aug 15, 2018
  
  cd6a5193
- Add argument to remove unused translations when running makemessages · c7c4f5df
  Joren Vrancken authored Aug 15, 2018
  
  c7c4f5df
- Fix language override · bac49681
  Thom Wiggers authored Aug 15, 2018
  
  bac49681
- Merge branch 'remove_source_me' into 'master' · 6ac2495c
  Joren Vrancken authored Aug 15, 2018
```
Remove `source_me.sh`, it's no longer necessary

See merge request !890
```
  6ac2495c
- Remove `source_me.sh`, it's no longer necessary · ace6ec7c
  Thom Wiggers authored Aug 15, 2018
  
  ace6ec7c
10 Aug, 2018 2 commits
- Merge branch 'remove_django_slack' into 'master' · e08a2f82
  Sébastiaan Versteeg authored Aug 10, 2018
```
Remove django-slack dependency

See merge request !889
```
  e08a2f82
- Remove django-slack dependency · 64776a69
  Joren Vrancken authored Aug 10, 2018
  
  64776a69
09 Aug, 2018 3 commits
- Merge branch 'fix/pizzas-validate-unique' into 'master' · 3421123d
  Thom Wiggers authored Aug 09, 2018
```
Fix pizzas uniqueness

Closes #668

See merge request !872
```
  3421123d
- Merge branch 'raven_info' into 'master' · 76a9a86a
  Sébastiaan Versteeg authored Aug 09, 2018
```
Change Raven logging level to INFO

See merge request !885
```
  76a9a86a
- Change Raven logging level to INFO · dd40c362
  Joren Vrancken authored Aug 09, 2018
  
  dd40c362
08 Aug, 2018 13 commits
- Merge branch 'pipenv-instead-of-requirements' into 'master' · 3992e984
  Sébastiaan Versteeg authored Aug 08, 2018
```
Use pipenv instead of requirements.txt

Closes #672 and #631

See merge request !879
```
  3992e984
- fix typo in dockerfile · 379f32d0
  Thom Wiggers authored Aug 08, 2018
  
  379f32d0
- update · 391d8cf8
  Thom Wiggers authored Aug 08, 2018
  
  391d8cf8
- only do deploy on non-dev builds · 31a3e0bd
  Thom Wiggers authored Aug 08, 2018
  
  31a3e0bd
- make docs build not update deps · 5290294e
  Thom Wiggers authored Aug 08, 2018
  
  5290294e
- Remove version pinning · 30ce7f4d
  Thom Wiggers authored Aug 08, 2018
  
  30ce7f4d
- Install pipenv in container · 6e544897
  Thom Wiggers authored Aug 08, 2018
  
  6e544897
- fix up dockerfile · c8b2b0e9
  Thom Wiggers authored Aug 02, 2018
  
  c8b2b0e9
- Pipenv docs · e40444f4
  Thom Wiggers authored Aug 02, 2018
  
  e40444f4
- fix .gitlab-ci.yml docs · 19db0328
  Thom Wiggers authored Aug 02, 2018
  
  19db0328
- First attempt at docker build · 36ccc79b
  Thom Wiggers authored Aug 01, 2018
  
  36ccc79b
- Attempt to fix docs build · 0b730753
  Thom Wiggers authored Aug 01, 2018
  
  0b730753
- Use pipenv instead of requirements.txt · 2740d53f
  Thom Wiggers authored Aug 01, 2018
  
  2740d53f
02 Aug, 2018 1 commit
- Merge branch 'django-security-update' into 'master' · 86bb6dab
  Sébastiaan Versteeg authored Aug 02, 2018
```
Update to Django >=2.0.8

See merge request !878
```
  86bb6dab
01 Aug, 2018 1 commit
- Update to Django >=2.0.8 · 5c59c323
  Thom Wiggers authored Aug 01, 2018
```
Fixes CVE-2018-14574: Open redirect possibility in CommonMiddleware
```
  5c59c323
25 Jul, 2018 10 commits
- Merge branch 'fix/registration-problems' into 'master' · e9d3b8a3
  Thom Wiggers authored Jul 25, 2018
```
Fix registration problems

See merge request !864
```
  e9d3b8a3
- Merge branch 'fix/registrations-confirm-email-doesnotexist' into 'master' · 77d9b01c
  Thom Wiggers authored Jul 25, 2018
```
Crash on confirming non-existing registration entry

Closes #665

See merge request !867
```
  77d9b01c
- Merge branch 'feature/registrations-starting-year-widget' into 'master' · ccd627fe
  Thom Wiggers authored Jul 25, 2018
```
Make starting year a dropdown in registration form

Closes #667

See merge request !869
```
  ccd627fe
- Merge branch 'translate_privacy_policy' into 'master' · 972f3778
  Thom Wiggers authored Jul 25, 2018
```
Translate privacy policy

See merge request !870
```
  972f3778
- Merge branch 'fix/requirements-file' into 'master' · 85cdd9fe
  Thom Wiggers authored Jul 25, 2018
```
Fix requirements.txt

See merge request !876
```
  85cdd9fe
- Merge branch 'feature/commit-in-html' into 'master' · 171066d4
  Thom Wiggers authored Jul 25, 2018
```
Commit ref in html

Closes #462

See merge request !877
```
  171066d4
- Merge branch 'master' into 'fix/requirements-file · d6a07455
  Sébastiaan Versteeg authored Jul 25, 2018
  
  d6a07455
- Merge branch 'feature/sentry-integration' into 'master' · eb3629cd
  Joren Vrancken authored Jul 25, 2018
```
Replace Slack reporting by Sentry reporting

See merge request !875
```
  eb3629cd
- Add build commit to HTML · 953fdd2a
  Sébastiaan Versteeg authored Jul 24, 2018
  
  953fdd2a
- Replace Slack reporting by Sentry reporting · 54a09071
  Sébastiaan Versteeg authored Jul 24, 2018
  
  54a09071